code cleanup: modify DO_INLINE define to not use __inline with mingw

make RegisterBlendExtension_Fail a static func
       u

diff --git a/intern/raskter/raskter.c b/intern/raskter/raskter.c
index eaf8dcd06daa791cdc62b66f212740ab1bae1460..875dfc8a63bea722f659ae40c3bde58fc337db4b 100644 (file)
--- a/intern/raskter/raskter.c
+++ b/intern/raskter/raskter.c
@@ -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

diff --git a/source/blender/blenkernel/BKE_colortools.h b/source/blender/blenkernel/BKE_colortools.h
index 9ce2de79dbf99472943acfe82af324d71764795f..9b7fc1fddad780efd82ef63eb61a1f910252b144 100644 (file)
--- a/source/blender/blenkernel/BKE_colortools.h
+++ b/source/blender/blenkernel/BKE_colortools.h
@@ -39,7 +39,7 @@ struct Histogram;
 struct ImBuf;
 struct rctf;
 
-#if defined _WIN32
+#if defined _MSC_VER
 #   define DO_INLINE __inline
 #elif defined(__sun) || defined(__sun__)
 #   define DO_INLINE

diff --git a/source/blender/blenlib/intern/winstuff.c b/source/blender/blenlib/intern/winstuff.c
index 5b5f4cf8b80b6eda2d8694c879cb080b56f5565c..a0b31f8d5b8b73e16d4d0f8e02decdb0a69dce74 100644 (file)
--- a/source/blender/blenlib/intern/winstuff.c
+++ b/source/blender/blenlib/intern/winstuff.c
@@ -68,7 +68,7 @@ int BLI_getInstallationDir(char *str)
        return 1;
 }
 
-void RegisterBlendExtension_Fail(HKEY root)
+static void RegisterBlendExtension_Fail(HKEY root)
 {
        printf("failed\n");
        if (root)

diff --git a/source/blender/nodes/intern/node_util.h b/source/blender/nodes/intern/node_util.h
index 9f9caef14e2b084ae5b641e7968e01743dcfc3f6..95104df5fedc5b53cb05d2c7f0e7d8d82441308a 100644 (file)
--- a/source/blender/nodes/intern/node_util.h
+++ b/source/blender/nodes/intern/node_util.h
@@ -67,7 +67,7 @@ ListBase node_internal_connect_default(struct bNodeTree *ntree, struct bNode *no
 #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