summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2000-04-12 05:29:10 +0000
committerBruce Momjian2000-04-12 05:29:10 +0000
commit7607b3387ab8a9ec14bbd7064cd8bc6b4f8ec5fd (patch)
tree38d1bba9f4f8fef8ba0bb56f5deedcaebd29cf9b
parenta29b0697afa7ad6adf9095f5ddf59ae23e183eaf (diff)
Reverse out macro fix for the time being.
-rw-r--r--src/include/c.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/include/c.h b/src/include/c.h
index cb63d670eb..ae92aa83e0 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -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: