[mpich2-commits] r5527 - mpich2/trunk/src/pm/hydra/include

[balaji at mcs.anl.gov]

Author: balaji
Date: 2009-10-21 18:45:31 -0500 (Wed, 21 Oct 2009)
New Revision: 5527

Modified:
   mpich2/trunk/src/pm/hydra/include/hydra_utils.h
Log:
Get rid of GNU'ism in macro definitions.

Modified: mpich2/trunk/src/pm/hydra/include/hydra_utils.h
===================================================================
--- mpich2/trunk/src/pm/hydra/include/hydra_utils.h	2009-10-21 22:51:36 UTC (rev 5526)
+++ mpich2/trunk/src/pm/hydra/include/hydra_utils.h	2009-10-21 23:45:31 UTC (rev 5527)
@@ -105,20 +105,15 @@
         }                                                               \
     }
 
-#if defined ENABLE_WARNINGS
+#if defined ENABLE_WARNINGS || !defined COMPILER_ACCEPTS_VA_ARGS
 #define HYDU_warn_printf HYDU_error_printf
 #else
-#define HYDU_warn_printf(...) {}
+#define HYDU_warn_printf(...)
 #endif /* ENABLE_WARNINGS */
 
-/* We need to add more information in here later */
-#if !defined ENABLE_DEBUG
-#define HYDU_FUNC_ENTER() {}
-#define HYDU_FUNC_EXIT() {}
-#else
-#define HYDU_FUNC_ENTER() {}
-#define HYDU_FUNC_EXIT() {}
-#endif
+/* Disable for now; we might add something here in the future */
+#define HYDU_FUNC_ENTER()   do{}while(0)
+#define HYDU_FUNC_EXIT()    do{}while(0)
 
 
 /* alloc */