diff options
| -rw-r--r-- | intern/raskter/raskter.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/BKE_colortools.h | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/winstuff.c | 2 | ||||
| -rw-r--r-- | source/blender/nodes/intern/node_util.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/intern/raskter/raskter.c b/intern/raskter/raskter.c index eaf8dcd06da..875dfc8a63b 100644 --- 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 9ce2de79dbf..9b7fc1fddad 100644 --- 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 5b5f4cf8b80..a0b31f8d5b8 100644 --- 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 9f9caef14e2..95104df5fed 100644 --- 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 |