firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 06:43:03 +01:00
Code Issues

Cleanup SUPERCLIENT - use other logic to decide where should assert message go

Browse Source
This commit is contained in:
alexpeshkoff 2010-03-30 14:22:50 +00:00
parent 1bcc855353
commit b3d99a010e
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/jrd/gdsassert.h
View File

@ -28,24 +28,22 @@
#include <stdlib.h> // abort() #include <stdlib.h> // abort()
#include <stdio.h> #include <stdio.h>
#ifdef WIN_NT
#include <io.h> // isatty()
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h> // isatty()
#endif
#define FB_ASSERT_FAILURE_STRING "Assertion (%s) failure: %s %"LINEFORMAT"\n" #define FB_ASSERT_FAILURE_STRING "Assertion (%s) failure: %s %"LINEFORMAT"\n"
#ifdef SUPERCLIENT
#if !defined(fb_assert) #if !defined(fb_assert)
#define fb_assert(ex) {if (!(ex)) {fprintf(stderr, FB_ASSERT_FAILURE_STRING, #ex, __FILE__, __LINE__); abort();}} #define fb_assert_continue(ex) {if (!(ex)) {if (isatty(2)) fprintf(stderr, FB_ASSERT_FAILURE_STRING, #ex, __FILE__, __LINE__);\
#define fb_assert_continue(ex) {if (!(ex)) {fprintf(stderr, FB_ASSERT_FAILURE_STRING, #ex, __FILE__, __LINE__);}} else gds__log(FB_ASSERT_FAILURE_STRING, #ex, __FILE__, __LINE__);}}
#define fb_assert(ex) {if (!(ex)) {if (isatty(2)) fprintf(stderr, FB_ASSERT_FAILURE_STRING, #ex, __FILE__, __LINE__);\
else gds__log(FB_ASSERT_FAILURE_STRING, #ex, __FILE__, __LINE__); abort();}}
#endif #endif
#else // !SUPERCLIENT
#if !defined(fb_assert)
#define fb_assert(ex) {if (!(ex)) {gds__log(FB_ASSERT_FAILURE_STRING, #ex, __FILE__, __LINE__); abort();}}
#define fb_assert_continue(ex) {if (!(ex)) {gds__log(FB_ASSERT_FAILURE_STRING, #ex, __FILE__, __LINE__);}}
#endif
#endif // SUPERCLIENT
#else // DEV_BUILD #else // DEV_BUILD
#define fb_assert(ex) // nothing #define fb_assert(ex) // nothing