diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c index b46037e7e406fe7d4d7caab570ebb30984b66907..7a26f2c99bccaf734105ec74a61583259d1a9e2f 100644 --- a/src/backend/access/index/istrat.c +++ b/src/backend/access/index/istrat.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.17 1998/02/26 04:29:36 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.18 1998/04/06 17:27:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,7 +26,7 @@ #include #include -#ifndef NO_ASSERT_CHECKING +#ifdef USE_ASSERT_CHECKING static bool StrategyEvaluationIsValid(StrategyEvaluation evaluation); static bool StrategyExpressionIsValid(StrategyExpression expression, @@ -113,7 +113,7 @@ AttributeNumberGetIndexStrategySize(AttrNumber maxAttributeNumber, maxAttributeNumber * maxStrategyNumber * sizeof(ScanKeyData); } -#ifndef NO_ASSERT_CHECKING +#ifdef USE_ASSERT_CHECKING /* * StrategyTransformMapIsValid is now a macro in istrat.h -cim 4/27/91 */ diff --git a/src/backend/lib/fstack.c b/src/backend/lib/fstack.c index f28f24ae14119b0e59c63208e02bc6cdbf634e05..92a21c9bba2fba1129e5ee6da5b0298c51d24f45 100644 --- a/src/backend/lib/fstack.c +++ b/src/backend/lib/fstack.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/lib/Attic/fstack.c,v 1.6 1997/09/08 02:22:57 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/lib/Attic/fstack.c,v 1.7 1998/04/06 17:27:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -84,7 +84,7 @@ FixedStackPush(FixedStack stack, Pointer pointer) stack->top = item; } -#ifndef NO_ASSERT_CHECKING +#ifdef USE_ASSERT_CHECKING /* * FixedStackContains -- * True iff ordered stack contains given element. diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c index 655adc9d31cf4170680225ee46f1eba38d1a0055..10a10e33ef1ab539a85576931cdf28f324a2d302 100644 --- a/src/backend/storage/ipc/shmem.c +++ b/src/backend/storage/ipc/shmem.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.17 1998/02/26 04:35:46 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.18 1998/04/06 17:27:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -511,7 +511,7 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr) if (!BindingTable) { /* Assert() is a macro now. substitutes inside quotes. */ -#ifndef NO_ASSERT_CHECKING +#ifdef USE_ASSERT_CHECKING char *strname = "BindingTable"; #endif diff --git a/src/configure b/src/configure index 8116a25646f51dccbe6231bd6cee4f72633623fb..f4e9cb779e750fb540839eeb96d99f7a241228d2 100755 --- a/src/configure +++ b/src/configure @@ -13,21 +13,21 @@ ac_default_prefix=/usr/local # Any additions from configure.in: ac_default_prefix=/usr/local/pgsql ac_help="$ac_help - --with-includes=DIR site header files for tk/tcl, etc in DIR" + --with-includes=DIR site header files for tk/tcl, etc in DIR" ac_help="$ac_help - --with-libraries=DIR site library directories for tk/tcl, etc in DIR" + --with-libraries=DIR site library directories for tk/tcl, etc in DIR" ac_help="$ac_help - --enable-locale enable locale support " + --enable-locale enable locale support " ac_help="$ac_help - --enable-recode enable cyrillic recode support " + --enable-recode enable cyrillic recode support " ac_help="$ac_help --with-pgport= change default startup port " ac_help="$ac_help - --with-tcl use tcl " + --with-tcl use tcl " ac_help="$ac_help - --with-perl use perl " + --with-perl use perl " ac_help="$ac_help - --enable-cassert enable assertion checks (debugging) " + --enable-cassert enable assertion checks (debugging) " ac_help="$ac_help --with-x use the X Window System" @@ -877,7 +877,7 @@ echo "configure:876: checking setting ASSERT CHECKING" >&5 if test "${enable_cassert+set}" = set; then enableval="$enable_cassert" cat >> confdefs.h <<\EOF -#define NO_ASSERT_CHECKING 1 +#define USE_ASSERT_CHECKING 1 EOF echo "$ac_t""enabled" 1>&6 else diff --git a/src/configure.in b/src/configure.in index 35f01467f050d703de4991c1c1b5cb3aebfe5202..3ce50068547762e30ec08cc843cd0e8d9ca142bf 100644 --- a/src/configure.in +++ b/src/configure.in @@ -142,7 +142,7 @@ LIBS=`grep '^LIBS:' $TEMPLATE | awk -F: '{print $2}'` AC_ARG_WITH(includes, - [ --with-includes=DIR site header files for tk/tcl, etc in DIR], + [ --with-includes=DIR site header files for tk/tcl, etc in DIR], [ case "$withval" in "" | y | ye | yes | n | no) @@ -163,7 +163,7 @@ if test "$INCLUDE_DIRS"; then fi AC_ARG_WITH(libraries, - [ --with-libraries=DIR site library directories for tk/tcl, etc in DIR], + [ --with-libraries=DIR site library directories for tk/tcl, etc in DIR], [ case "$withval" in "" | y | ye | yes | n | no) @@ -191,7 +191,7 @@ dnl It defaults to disabled AC_MSG_CHECKING(setting USE_LOCALE) AC_ARG_ENABLE( locale, - [ --enable-locale enable locale support ], + [ --enable-locale enable locale support ], AC_DEFINE(USE_LOCALE) AC_MSG_RESULT(enabled), AC_MSG_RESULT(disabled) ) @@ -204,7 +204,7 @@ dnl It defaults to disabled AC_MSG_CHECKING(setting CYR_RECODE) AC_ARG_ENABLE( recode, - [ --enable-recode enable cyrillic recode support ], + [ --enable-recode enable cyrillic recode support ], AC_DEFINE(CYR_RECODE) AC_MSG_RESULT(enabled), AC_MSG_RESULT(disabled) ) @@ -223,7 +223,7 @@ dnl We exclude tcl support unless we override it with --with-tcl AC_MSG_CHECKING(setting USE_TCL) AC_ARG_WITH( tcl, - [ --with-tcl use tcl ], + [ --with-tcl use tcl ], USE_TCL=true; AC_MSG_RESULT(enabled), USE_TCL=false; AC_MSG_RESULT(disabled) ) @@ -255,7 +255,7 @@ dnl We exclude perl support unless we override it with --with-perl AC_MSG_CHECKING(setting USE_PERL) AC_ARG_WITH( perl, - [ --with-perl use perl ], + [ --with-perl use perl ], USE_PERL=true; AC_MSG_RESULT(enabled), USE_PERL=false; AC_MSG_RESULT(disabled) ) @@ -279,8 +279,8 @@ dnl We need some explanatory text here. AC_MSG_CHECKING(setting ASSERT CHECKING) AC_ARG_ENABLE( cassert, - [ --enable-cassert enable assertion checks (debugging) ], - AC_DEFINE(NO_ASSERT_CHECKING) AC_MSG_RESULT(enabled), + [ --enable-cassert enable assertion checks (debugging) ], + AC_DEFINE(USE_ASSERT_CHECKING) AC_MSG_RESULT(enabled), AC_MSG_RESULT(disabled) ) diff --git a/src/include/c.h b/src/include/c.h index ae330d24050bf063f570c5177c19f57416e5523c..bbc8426e99c2fcdc8fa8d594856c0cc1395b5298 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: c.h,v 1.38 1998/03/31 15:53:39 momjian Exp $ + * $Id: c.h,v 1.39 1998/04/06 17:27:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -583,12 +583,12 @@ typedef struct Exception } Exception; /* - * NO_ASSERT_CHECKING, if defined, turns off all the assertions. + * USE_ASSERT_CHECKING, if defined, turns off all the assertions. * - plai 9/5/90 * * It should _NOT_ be undef'ed in releases or in benchmark copies * - * #undef NO_ASSERT_CHECKING + * #undef USE_ASSERT_CHECKING */ /* @@ -614,7 +614,7 @@ typedef struct Exception &(exception), \ (char*) NULL, __FILE__, __LINE__)))) -#ifdef NO_ASSERT_CHECKING +#ifndef USE_ASSERT_CHECKING #define Assert(condition) #define AssertMacro(condition) true #define AssertArg(condition) @@ -632,7 +632,7 @@ typedef struct Exception #define AssertState(condition) \ Trap(!(condition), BadState) -#endif /* NO_ASSERT_CHECKING */ +#endif /* USE_ASSERT_CHECKING */ /* * LogTrap -- @@ -655,7 +655,7 @@ typedef struct Exception &(exception), \ form printArgs, __FILE__, __LINE__)))) -#ifdef NO_ASSERT_CHECKING +#ifndef USE_ASSERT_CHECKING #define LogAssert(condition, printArgs) #define LogAssertMacro(condition, printArgs) true #define LogAssertArg(condition, printArgs) @@ -673,7 +673,7 @@ typedef struct Exception #define LogAssertState(condition, printArgs) \ LogTrap(!(condition), BadState, printArgs) -#endif /* NO_ASSERT_CHECKING */ +#endif /* USE_ASSERT_CHECKING */ /* ---------------------------------------------------------------- * Section 8: Min, Max, Abs macros diff --git a/src/include/config.h.in b/src/include/config.h.in index 58088e87dc5a214f4fc0dc51ecdb2f85921caac1..62849411e8380fe5c438943160521b47faac542d 100644 --- a/src/include/config.h.in +++ b/src/include/config.h.in @@ -208,7 +208,7 @@ extern void srandom(int seed); #undef CYR_RECODE /* Set to 1 if you want to Disable ASSERT CHECKING */ -#undef NO_ASSERT_CHECKING +#undef USE_ASSERT_CHECKING /* * Code below this point should not require changes