Reverse out macro fix for the time being.

diff --git a/src/include/c.h b/src/include/c.h
index af895f8bac37efa1095e12ae1d4725f49c928f07..abc3923f9d2192d86225f8e3b24c9f5077eeb013 100644 (file)
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: c.h,v 1.67 2000/04/12 05:24:50 momjian Exp $
+ * $Id: c.h,v 1.68 2000/04/12 05:29:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -531,11 +531,9 @@ typedef struct Exception
  *
  */
 #define Trap(condition, exception) \
-               do { \
-                       if ((assert_enabled) && (condition)) \
+               { if ((assert_enabled) && (condition)) \
                                ExceptionalCondition(CppAsString(condition), &(exception), \
-                                               (char*)NULL, __FILE__, __LINE__); \
-               } while (0)
+                                               (char*)NULL, __FILE__, __LINE__); }
 
 /*
  *     TrapMacro is the same as Trap but it's intended for use in macros:
@@ -579,11 +577,9 @@ extern int assert_enabled;
  *
  */
 #define LogTrap(condition, exception, printArgs) \
-               do { \
-                       if ((assert_enabled) && (condition)) \
+               { if ((assert_enabled) && (condition)) \
                                ExceptionalCondition(CppAsString(condition), &(exception), \
-                                               vararg_format printArgs, __FILE__, __LINE__); \
-               } while (0)
+                                               vararg_format printArgs, __FILE__, __LINE__); }
 
 /*
  *     LogTrapMacro is the same as LogTrap but it's intended for use in macros: