diff options
| author | Morgan Deters <mdeters@gmail.com> | 2009-12-16 04:25:45 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2009-12-16 04:25:45 +0000 |
| commit | 79df573326e6911d3a97fcc2528105acd1c2c525 (patch) | |
| tree | 70930bcdb620cdf8ff9e3e9c495f67ed8317aa2e /src/include | |
| parent | 8cb3a7b556e8b4b85745bffbd1f0246e6af29588 (diff) | |
Fixes to the build system:
Makefile.am files - remove obsolete INCLUDES, incorporate into AM_CPPFLAGS
Makefile files in src/ - support "make" under src/ (current build profile)
configure.ac - updates to fix warnings
config/antlr.m4 - updates to fix warnings
autogen.sh - updates to generate warnings from autotools; also support Macs
src/include/cvc4_config.h - guard with #ifdef
total reimplementation of NodeBuilder
ExprValue => NodeValue
context_mm.{h,cpp} - fixed numerous compile errors
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/cvc4_config.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/include/cvc4_config.h b/src/include/cvc4_config.h index a42ae28fb..f1877781f 100644 --- a/src/include/cvc4_config.h +++ b/src/include/cvc4_config.h @@ -10,6 +10,9 @@ ** [[ Add file-specific comments here ]] **/ +#ifndef __CVC4_CONFIG_H +#define __CVC4_CONFIG_H + #if defined _WIN32 || defined __CYGWIN__ # ifdef BUILDING_DLL # ifdef __GNUC__ @@ -35,3 +38,9 @@ #define EXPECT_TRUE(x) __builtin_expect( (x), true) #define EXPECT_FALSE(x) __builtin_expect( (x), false) #define NORETURN __attribute__ ((noreturn)) + +#ifndef NULL +# define NULL ((void*) 0) +#endif + +#endif /* __CVC4_CONFIG_H */ |