Arf -- didn't test the OMPI_DEBUG_ZERO with an optimized build, and it

caused the nightlies to fail.  Move the definition of OMPI_DEBUG_ZERO
up to ompi_config_bottom.h and now all is well.

This commit was SVN r3664.

include/ompi_config_bottom.h

@@ -135,23 +135,31 @@ typedef long long bool;
    source tree [including headers] available, and b) we guaranteed to
    *not* to include anything else via util/malloc.h, so we won't
    have Cascading Includes Of Death. */
-#include "util/malloc.h"
+#    include "util/malloc.h"
-#if defined(malloc)
+#    if defined(malloc)
-#undef malloc
+#        undef malloc
-#endif
+#    endif
-#define malloc(size) ompi_malloc((size), __FILE__, __LINE__)
+#    define malloc(size) ompi_malloc((size), __FILE__, __LINE__)
-#if defined(calloc)
+#    if defined(calloc)
-#undef calloc
+#        undef calloc
-#endif
+#    endif
-#define calloc(nmembers, size) ompi_calloc((nmembers), (size), __FILE__, __LINE__)
+#    define calloc(nmembers, size) ompi_calloc((nmembers), (size), __FILE__, __LINE__)
-#if defined(realloc)
+#    if defined(realloc)
-#undef realloc
+#        undef realloc
-#endif
+#    endif
-#define realloc(ptr, size) ompi_realloc((ptr), (size), __FILE__, __LINE__)
+#    define realloc(ptr, size) ompi_realloc((ptr), (size), __FILE__, __LINE__)
-#if defined(free)
+#    if defined(free)
-#undef free
+#        undef free
-#endif
+#    endif
-#define free(ptr) ompi_free((ptr), __FILE__, __LINE__)
+#    define free(ptr) ompi_free((ptr), __FILE__, __LINE__)
+
+/*
+ * If we're mem debugging, make the OMPI_DEBUG_ZERO resolve to memset
+ */
+#    include <string.h>
+#    define OMPI_DEBUG_ZERO(obj) memset(&obj, 0, sizeof(obj))
+#else
+#    define OMPI_DEBUG_ZERO(obj)
 #endif
 
 

src/util/malloc.h

@@ -36,15 +36,6 @@
 #define OMPI_MALLOC_DEBUG_LEVEL 2
 #endif
 
-/*
- * If we're mem debugging, make the OMPI_DEBUG_ZERO resolve to memset
- */
-#if defined(OMPI_ENABLE_MEM_DEBUG) && OMPI_ENABLE_MEM_DEBUG
-#define OMPI_DEBUG_ZERO(obj) memset(&obj, 0, sizeof(obj))
-#else
-#define OMPI_DEBUG_ZERO(obj)
-#endif
-
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif