[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51688] trunk/blender/source/blender/ blenlib/BLI_utildefines.h: comment testing typechecking code, was causing issues on gcc 4.4 for some reason.

[Campbell Barton]

Revision: 51688
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51688
Author:   campbellbarton
Date:     2012-10-27 15:08:40 +0000 (Sat, 27 Oct 2012)
Log Message:
-----------
comment testing typechecking code, was causing issues on gcc 4.4 for some reason.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_utildefines.h

Modified: trunk/blender/source/blender/blenlib/BLI_utildefines.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_utildefines.h	2012-10-27 15:05:12 UTC (rev 51687)
+++ trunk/blender/source/blender/blenlib/BLI_utildefines.h	2012-10-27 15:08:40 UTC (rev 51688)
@@ -44,16 +44,16 @@
 #if 0
 /* gcc only */
 #  define _TYPECHECK(a, b)  ((void)(((typeof(a) *)0) == ((typeof(b) *)0)))
-#else
-#  define _TYPECHECK(a, b) (void)0
+#  define MIN2(x, y)          (_TYPECHECK(x, y), (((x) < (y) ? (x) : (y))))
+#  define MAX2(x, y)          (_TYPECHECK(x, y), (((x) > (y) ? (x) : (y))))
 #endif
 
 /* min/max */
-#define MIN2(x, y)          (_TYPECHECK(x, y), (((x) < (y) ? (x) : (y))))
+#define MIN2(x, y)          ((x) < (y) ? (x) : (y))
 #define MIN3(x, y, z)       (MIN2(MIN2((x), (y)), (z)))
 #define MIN4(x, y, z, a)    (MIN2(MIN2((x), (y)), MIN2((z), (a))))
 
-#define MAX2(x, y)          (_TYPECHECK(x, y), (((x) > (y) ? (x) : (y))))
+#define MAX2(x, y)          ((x) > (y) ? (x) : (y))
 #define MAX3(x, y, z)       (MAX2(MAX2((x), (y)), (z)))
 #define MAX4(x, y, z, a)    (MAX2(MAX2((x), (y)), MAX2((z), (a))))