rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reverse out macro fix for the time being.

This commit is contained in:
Bruce Momjian 2000-04-12 05:29:10 +00:00
parent 8758985c3a
commit db4518729d
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/include/c.h
View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * 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) \ #define Trap(condition, exception) \
do { \ { if ((assert_enabled) && (condition)) \
if ((assert_enabled) && (condition)) \
ExceptionalCondition(CppAsString(condition), &(exception), \ ExceptionalCondition(CppAsString(condition), &(exception), \
(char*)NULL, __FILE__, __LINE__); \ (char*)NULL, __FILE__, __LINE__); }
} while (0)
/* /*
* TrapMacro is the same as Trap but it's intended for use in macros: * 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) \ #define LogTrap(condition, exception, printArgs) \
do { \ { if ((assert_enabled) && (condition)) \
if ((assert_enabled) && (condition)) \
ExceptionalCondition(CppAsString(condition), &(exception), \ ExceptionalCondition(CppAsString(condition), &(exception), \
vararg_format printArgs, __FILE__, __LINE__); \ vararg_format printArgs, __FILE__, __LINE__); }
} while (0)
/* /*
* LogTrapMacro is the same as LogTrap but it's intended for use in macros: * LogTrapMacro is the same as LogTrap but it's intended for use in macros: