[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40060] trunk/blender/source/blender/ makesrna: workaround for msvc not supporting variable length args in macros .

Campbell Barton ideasman42 at gmail.com
Fri Sep 9 13:54:14 CEST 2011


Revision: 40060
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40060
Author:   campbellbarton
Date:     2011-09-09 11:54:13 +0000 (Fri, 09 Sep 2011)
Log Message:
-----------
workaround for msvc not supporting variable length args in macros.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/RNA_access.h
    trunk/blender/source/blender/makesrna/intern/rna_access.c

Modified: trunk/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- trunk/blender/source/blender/makesrna/RNA_access.h	2011-09-09 10:22:28 UTC (rev 40059)
+++ trunk/blender/source/blender/makesrna/RNA_access.h	2011-09-09 11:54:13 UTC (rev 40060)
@@ -976,7 +976,11 @@
 
 
 /* macro which inserts the function name */
-#define RNA_warning(format, args...) _RNA_warning("%s: " format "\n", __func__, ##args)
+#ifdef __GNUC__
+#  define RNA_warning(format, args...) _RNA_warning("%s: " format "\n", __func__, ##args)
+#else /* MSVC doesnt support variable length args in macros */
+#  define RNA_warning _RNA_warning
+#endif
 
 void _RNA_warning(const char *format, ...)
 #ifdef __GNUC__

Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_access.c	2011-09-09 10:22:28 UTC (rev 40059)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c	2011-09-09 11:54:13 UTC (rev 40060)
@@ -5383,6 +5383,11 @@
 	vprintf(format, args);
 	va_end(args);
 
+	/* gcc macro adds '\n', but cant use for other compilers */
+#ifndef __GNUC__
+	fputc('\n', stdout);
+#endif
+
 #ifdef WITH_PYTHON
 	{
 		extern void PyC_LineSpit(void);




More information about the Bf-blender-cvs mailing list