* map.c: _cnm_return_val_if_overflow() should be a no-op unless DEBUG is

	  defined.  "Fixes" false positives pending further investigation.

svn path=/trunk/mono/; revision=68770

diff --git a/support/ChangeLog b/support/ChangeLog
index 4fc1bfecab19506b52388b1fc4bb5a757b8c4ca7..10097e6b8a4b92a3347e2fbc0eb4d055b29ce240 100644 (file)
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-30  Jonathan Pryor  <jonpryor@vt.edu>
+
+       * map.c: _cnm_return_val_if_overflow() should be a no-op unless DEBUG is
+         defined.  "Fixes" false positives pending further investigation.
+
 2006-11-18  Miguel de Icaza  <miguel@novell.com>
 
        * serial.c (poll_serial): Do not report an error for EINTR. 

diff --git a/support/map.c b/support/map.c
index 1701cf3e58e8cc14648726691fed1a544ae6df56..e474af94a0070fd2319ac6593272575d805a44b6 100644 (file)
--- a/support/map.c
+++ b/support/map.c
@@ -204,6 +204,7 @@
 #define _cnm_dump_(to_t, from) do {} while (0)
 #endif
 
+#ifdef DEBUG
 #define _cnm_return_val_if_overflow(to_t,from,val)  G_STMT_START {   \
     gint64  sf = (gint64) from;                                      \
     guint64 uf = (guint64) from;                                     \
@@ -214,6 +215,11 @@
       return (val);                                                  \
     }                                                                \
   } G_STMT_END
+#else /* !def DEBUG */
+/* don't do an overflow checking */
+#define _cnm_return_val_if_overflow(to_t,from,val)  G_STMT_START {   \
+  } G_STMT_END
+#endif /* def DEBUG */
 
 int Mono_Posix_FromAccessModes (int x, int *r)
 {