|
8 | 8 | * Portions Copyright (c) 1996-2000, PostgreSQL, Inc |
9 | 9 | * Portions Copyright (c) 1994, Regents of the University of California |
10 | 10 | * |
11 | | - * $Id: c.h,v 1.67 2000/04/12 05:24:50 momjian Exp $ |
| 11 | + * $Id: c.h,v 1.68 2000/04/12 05:29:10 momjian Exp $ |
12 | 12 | * |
13 | 13 | *------------------------------------------------------------------------- |
14 | 14 | */ |
@@ -531,11 +531,9 @@ typedef struct Exception |
531 | 531 | * |
532 | 532 | */ |
533 | 533 | #defineTrap(condition,exception) \ |
534 | | -do { \ |
535 | | -if ((assert_enabled) && (condition)) \ |
| 534 | +{ if ((assert_enabled) && (condition)) \ |
536 | 535 | ExceptionalCondition(CppAsString(condition), &(exception), \ |
537 | | -(char*)NULL, __FILE__, __LINE__); \ |
538 | | -} while (0) |
| 536 | +(char*)NULL, __FILE__, __LINE__); } |
539 | 537 |
|
540 | 538 | /* |
541 | 539 | *TrapMacro is the same as Trap but it's intended for use in macros: |
@@ -579,11 +577,9 @@ extern intassert_enabled; |
579 | 577 | * |
580 | 578 | */ |
581 | 579 | #defineLogTrap(condition,exception,printArgs) \ |
582 | | -do { \ |
583 | | -if ((assert_enabled) && (condition)) \ |
| 580 | +{ if ((assert_enabled) && (condition)) \ |
584 | 581 | ExceptionalCondition(CppAsString(condition), &(exception), \ |
585 | | -vararg_format printArgs, __FILE__, __LINE__); \ |
586 | | -} while (0) |
| 582 | +vararg_format printArgs, __FILE__, __LINE__); } |
587 | 583 |
|
588 | 584 | /* |
589 | 585 | *LogTrapMacro is the same as LogTrap but it's intended for use in macros: |
|