diff options
| author | Bryce McKinlay <mckinlay@redhat.com> | 2005-01-02 03:35:57 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2005-01-02 03:35:57 +0000 |
| commit | 9a060b37a175859748dce4d4cb7265642b0ea848 (patch) | |
| tree | 3d578519fc9cb151022d0814800672bd94732b72 /boehm-gc/include | |
| parent | 3ffd0339c74b0024a3a2a7c2713c85e100a82e56 (diff) | |
| download | gcc-9a060b37a175859748dce4d4cb7265642b0ea848.zip gcc-9a060b37a175859748dce4d4cb7265642b0ea848.tar.gz gcc-9a060b37a175859748dce4d4cb7265642b0ea848.tar.bz2 | |
boehm-gc.h: Include gc_ext_config.h, not gc_config.h.
2005-01-01 Bryce McKinlay <mckinlay@redhat.com>
* include/boehm-gc.h: Include gc_ext_config.h, not gc_config.h.
2005-01-01 Bryce McKinlay <mckinlay@redhat.com>
* configure.ac (AC_CONFIG_HEADERS): Build both include/gc_config.h
and include/gc_ext_config.h.
* include/gc_ext_config.h: New file. Define only THREAD_LOCAL_ALLOC.
* include/gc.h: Undef PACKAGE_* before including gc_config.h.
From-SVN: r92801
Diffstat (limited to 'boehm-gc/include')
| -rw-r--r-- | boehm-gc/include/gc.h | 22 | ||||
| -rw-r--r-- | boehm-gc/include/gc_ext_config.h.in | 5 |
2 files changed, 27 insertions, 0 deletions
diff --git a/boehm-gc/include/gc.h b/boehm-gc/include/gc.h index e1f2aa8..0781a61 100644 --- a/boehm-gc/include/gc.h +++ b/boehm-gc/include/gc.h @@ -30,6 +30,28 @@ # define _GC_H +/* + * As this header includes gc_config.h, preprocessor conflicts can occur with + * clients that include their own autoconf headers. The following #undef's + * work around some likely conflicts. + */ + +# ifdef PACKAGE_NAME +# undef PACKAGE_NAME +# endif +# ifdef PACKAGE_BUGREPORT +# undef PACKAGE_BUGREPORT +# endif +# ifdef PACKAGE_STRING +# undef PACKAGE_STRING +# endif +# ifdef PACKAGE_TARNAME +# undef PACKAGE_TARNAME +# endif +# ifdef PACKAGE_VERSION +# undef PACKAGE_VERSION +# endif + # include <gc_config.h> # include "gc_config_macros.h" diff --git a/boehm-gc/include/gc_ext_config.h.in b/boehm-gc/include/gc_ext_config.h.in new file mode 100644 index 0000000..52a662d --- /dev/null +++ b/boehm-gc/include/gc_ext_config.h.in @@ -0,0 +1,5 @@ +/* include/gc_ext_config.h.in. This contains definitions needed by +external clients that do not want to include the full gc.h. Currently this +is used by libjava/include/boehm-gc.h. */ + +#undef THREAD_LOCAL_ALLOC |