[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50612] trunk/blender: code cleanup: modify DO_INLINE define to not use __inline with mingw

[Campbell Barton]

Revision: 50612
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50612
Author:   campbellbarton
Date:     2012-09-15 02:29:47 +0000 (Sat, 15 Sep 2012)
Log Message:
-----------
code cleanup: modify DO_INLINE define to not use __inline with mingw
make RegisterBlendExtension_Fail a static func
       u

Modified Paths:
--------------
    trunk/blender/intern/raskter/raskter.c
    trunk/blender/source/blender/blenkernel/BKE_colortools.h
    trunk/blender/source/blender/blenlib/intern/winstuff.c
    trunk/blender/source/blender/nodes/intern/node_util.h

Modified: trunk/blender/intern/raskter/raskter.c
===================================================================
--- trunk/blender/intern/raskter/raskter.c	2012-09-15 01:52:28 UTC (rev 50611)
+++ trunk/blender/intern/raskter/raskter.c	2012-09-15 02:29:47 UTC (rev 50612)
@@ -38,7 +38,7 @@
 
 
 // this is needed for inlining behavior
-#if defined _WIN32
+#if defined _MSC_VER
 #   define DO_INLINE __inline
 #elif defined (__sun) || defined (__sun__)
 #   define DO_INLINE

Modified: trunk/blender/source/blender/blenkernel/BKE_colortools.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_colortools.h	2012-09-15 01:52:28 UTC (rev 50611)
+++ trunk/blender/source/blender/blenkernel/BKE_colortools.h	2012-09-15 02:29:47 UTC (rev 50612)
@@ -39,7 +39,7 @@
 struct ImBuf;
 struct rctf;
 
-#if defined _WIN32
+#if defined _MSC_VER
 #   define DO_INLINE __inline
 #elif defined(__sun) || defined(__sun__)
 #   define DO_INLINE

Modified: trunk/blender/source/blender/blenlib/intern/winstuff.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/winstuff.c	2012-09-15 01:52:28 UTC (rev 50611)
+++ trunk/blender/source/blender/blenlib/intern/winstuff.c	2012-09-15 02:29:47 UTC (rev 50612)
@@ -68,7 +68,7 @@
 	return 1;
 }
 
-void RegisterBlendExtension_Fail(HKEY root)
+static void RegisterBlendExtension_Fail(HKEY root)
 {
 	printf("failed\n");
 	if (root)

Modified: trunk/blender/source/blender/nodes/intern/node_util.h
===================================================================
--- trunk/blender/source/blender/nodes/intern/node_util.h	2012-09-15 01:52:28 UTC (rev 50611)
+++ trunk/blender/source/blender/nodes/intern/node_util.h	2012-09-15 02:29:47 UTC (rev 50612)
@@ -67,7 +67,7 @@
 #endif
 
 // this is needed for inlining behavior
-#if defined _WIN32
+#if defined _MSC_VER
 #   define DO_INLINE __inline
 #elif defined (__sun) || defined (__sun__)
 #   define DO_INLINE