Skip to content

P
Postgres FD Implementation
Commit db451872 authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

Reverse out macro fix for the time being.

parent 8758985c
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 9 deletions
src/include/c.h
View file @ db451872
...@@ -8,7 +8,7 @@ ...@@ -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 ...@@ -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; ...@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment