diff options
| author | ivmai <ivmai> | 2011-03-07 08:49:05 +0000 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2011-07-26 21:06:56 +0400 |
| commit | ba41f966c4d3041e54117cdeb29b0ad53b8d8dc9 (patch) | |
| tree | 59e08aa3b768f011f3f053cfdce85936536e4f11 /include/gc_version.h | |
| parent | bd86ef8b64d8a1db388ee8963c54af411e8a226d (diff) | |
| download | bdwgc-ba41f966c4d3041e54117cdeb29b0ad53b8d8dc9.tar.gz | |
2011-03-07 Ivan Maidanski
* include/gc.h (GC_ADD_CALLER, GC_RETURN_ADDR,
GC_HAVE_BUILTIN_BACKTRACE, GC_CAN_SAVE_CALL_STACKS): Move
definition to gc_config_macros.h file.
* include/gc_config_macros.h: Check the file is included from gc.h
file.
* include/gc_version.h: Ditto.
* include/gc_config_macros.h: Reformat comments.
* include/gc_version.h: Reformat code.
Diffstat (limited to 'include/gc_version.h')
| -rw-r--r-- | include/gc_version.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/include/gc_version.h b/include/gc_version.h index 2065691d..ee3bb22c 100644 --- a/include/gc_version.h +++ b/include/gc_version.h @@ -15,6 +15,9 @@ * modified is included with the above copyright notice. */ +/* This should never be included directly; it is included only from gc.h. */ +#if defined(GC_H) + /* The version here should match that in configure/configure.ac */ /* Eventually this one may become unnecessary. For now we need */ /* it to keep the old-style build process working. */ @@ -23,18 +26,20 @@ #define GC_TMP_ALPHA_VERSION 5 #ifndef GC_NOT_ALPHA -# define GC_NOT_ALPHA 0xff +# define GC_NOT_ALPHA 0xff #endif -#if defined(GC_VERSION_MAJOR) -# if GC_TMP_VERSION_MAJOR != GC_VERSION_MAJOR || \ - GC_TMP_VERSION_MINOR != GC_VERSION_MINOR || \ - defined(GC_ALPHA_VERSION) != (GC_TMP_ALPHA_VERSION != GC_NOT_ALPHA) || \ - defined(GC_ALPHA_VERSION) && GC_TMP_ALPHA_VERSION != GC_ALPHA_VERSION +#ifdef GC_VERSION_MAJOR +# if GC_TMP_VERSION_MAJOR != GC_VERSION_MAJOR \ + || GC_TMP_VERSION_MINOR != GC_VERSION_MINOR \ + || defined(GC_ALPHA_VERSION) != (GC_TMP_ALPHA_VERSION != GC_NOT_ALPHA) \ + || (defined(GC_ALPHA_VERSION) && GC_TMP_ALPHA_VERSION != GC_ALPHA_VERSION) # error Inconsistent version info. Check doc/README, include/gc_version.h, and configure.ac. # endif #else # define GC_VERSION_MAJOR GC_TMP_VERSION_MAJOR # define GC_VERSION_MINOR GC_TMP_VERSION_MINOR # define GC_ALPHA_VERSION GC_TMP_ALPHA_VERSION +#endif /* !GC_VERSION_MAJOR */ + #endif |