[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36815] trunk/blender/source: quiet compiler warnings for -Wundef

[Campbell Barton]

Revision: 36815
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36815
Author:   campbellbarton
Date:     2011-05-22 04:25:31 +0000 (Sun, 22 May 2011)
Log Message:
-----------
quiet compiler warnings for -Wundef

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_path_util.h
    trunk/blender/source/blender/blenlib/intern/math_base.c
    trunk/blender/source/blender/imbuf/intern/IMB_anim.h
    trunk/blender/source/blender/imbuf/intern/md5.h
    trunk/blender/source/blender/python/generic/mathutils_Matrix.c
    trunk/blender/source/creator/creator.c

Modified: trunk/blender/source/blender/blenlib/BLI_path_util.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_path_util.h	2011-05-22 04:05:09 UTC (rev 36814)
+++ trunk/blender/source/blender/blenlib/BLI_path_util.h	2011-05-22 04:25:31 UTC (rev 36815)
@@ -86,7 +86,7 @@
 #ifdef WIN32
 #define BLENDER_USER_FORMAT		"%s\\Blender Foundation\\Blender\\%s"
 #define BLENDER_SYSTEM_FORMAT		"%s\\Blender Foundation\\Blender\\%s"
-#elif __APPLE__
+#elif defined(__APPLE__)
 #define BLENDER_USER_FORMAT			"%s/Blender/%s"
 #define BLENDER_SYSTEM_FORMAT			"%s/Blender/%s"
 #else

Modified: trunk/blender/source/blender/blenlib/intern/math_base.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_base.c	2011-05-22 04:05:09 UTC (rev 36814)
+++ trunk/blender/source/blender/blenlib/intern/math_base.c	2011-05-22 04:25:31 UTC (rev 36815)
@@ -34,7 +34,7 @@
 #include "BLI_math.h"
 
 /* WARNING: MSVC compiling hack for double_round() */
-#if (WIN32 || WIN64) && !(FREE_WINDOWS)
+#if (defined(WIN32) || defined(WIN64)) && !(defined(FREE_WINDOWS))
 
 /* from python 3.1 pymath.c */
 double copysign(double x, double y)

Modified: trunk/blender/source/blender/imbuf/intern/IMB_anim.h
===================================================================
--- trunk/blender/source/blender/imbuf/intern/IMB_anim.h	2011-05-22 04:05:09 UTC (rev 36814)
+++ trunk/blender/source/blender/imbuf/intern/IMB_anim.h	2011-05-22 04:25:31 UTC (rev 36815)
@@ -107,7 +107,7 @@
 #define SWAP_S(x) (((x << 8) & 0xff00) | ((x >> 8) & 0xff))
 
 /* more endianness... should move to a separate file... */
-#if defined(__sgi) || defined (__sparc) || (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__hppa__) || defined (__BIG_ENDIAN__)
+#if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__hppa__) || defined (__BIG_ENDIAN__)
 #define GET_ID GET_BIG_LONG
 #define LITTLE_LONG SWAP_LONG
 #else

Modified: trunk/blender/source/blender/imbuf/intern/md5.h
===================================================================
--- trunk/blender/source/blender/imbuf/intern/md5.h	2011-05-22 04:05:09 UTC (rev 36814)
+++ trunk/blender/source/blender/imbuf/intern/md5.h	2011-05-22 04:25:31 UTC (rev 36815)
@@ -24,7 +24,7 @@
 
 #include <stdio.h>
 
-#if defined HAVE_LIMITS_H || _LIBC
+#if defined HAVE_LIMITS_H || defined _LIBC
 # include <limits.h>
 #endif
 

Modified: trunk/blender/source/blender/python/generic/mathutils_Matrix.c
===================================================================
--- trunk/blender/source/blender/python/generic/mathutils_Matrix.c	2011-05-22 04:05:09 UTC (rev 36814)
+++ trunk/blender/source/blender/python/generic/mathutils_Matrix.c	2011-05-22 04:25:31 UTC (rev 36815)
@@ -132,12 +132,12 @@
 
 			const unsigned short row_size= PySequence_Size(arg); /* -1 is an error, size checks will accunt for this */
 
-			if(IN_RANGE_INCL(row_size, 2, 4)) {
+			if(row_size >= 2 && row_size <= 4) {
 				PyObject *item= PySequence_GetItem(arg, 0);
 				const unsigned short col_size= PySequence_Size(item);
 				Py_XDECREF(item);
 
-				if(IN_RANGE_INCL(col_size, 2, 4)) {
+				if(col_size >= 2 && col_size <= 4) {
 					/* sane row & col size, new matrix and assign as slice  */
 					PyObject *matrix= newMatrixObject(NULL, row_size, col_size, Py_NEW, type);
 					if(Matrix_ass_slice((MatrixObject *)matrix, 0, INT_MAX, arg) == 0) {

Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c	2011-05-22 04:05:09 UTC (rev 36814)
+++ trunk/blender/source/creator/creator.c	2011-05-22 04:25:31 UTC (rev 36815)
@@ -629,7 +629,7 @@
 			else if (!strcmp(imtype,"CINEON")) scene->r.imtype = R_CINEON;
 			else if (!strcmp(imtype,"DPX")) scene->r.imtype = R_DPX;
 #endif
-#if WITH_OPENJPEG
+#ifdef WITH_OPENJPEG
 			else if (!strcmp(imtype,"JP2")) scene->r.imtype = R_JP2;
 #endif
 			else printf("\nError: Format from '-F / --render-format' not known or not compiled in this release.\n");