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 | |
| parent | 3ffd0339c74b0024a3a2a7c2713c85e100a82e56 (diff) | |
| download | gcc-9a060b37a175859748dce4d4cb7265642b0ea848.tar.gz | |
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')
| -rw-r--r-- | boehm-gc/ChangeLog | 7 | ||||
| -rwxr-xr-x | boehm-gc/configure | 3 | ||||
| -rw-r--r-- | boehm-gc/configure.ac | 2 | ||||
| -rw-r--r-- | boehm-gc/include/gc.h | 22 | ||||
| -rw-r--r-- | boehm-gc/include/gc_ext_config.h.in | 5 |
5 files changed, 37 insertions, 2 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index bf95106fcbd..5bb9d45a435 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,10 @@ +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. + 2004-12-13 Kelley Cook <kcook@gcc.gnu.org> * configure: Regenerate. diff --git a/boehm-gc/configure b/boehm-gc/configure index 0f659721a87..36243d4c58b 100755 --- a/boehm-gc/configure +++ b/boehm-gc/configure @@ -6580,7 +6580,7 @@ else multilib_arg= fi - ac_config_headers="$ac_config_headers include/gc_config.h" + ac_config_headers="$ac_config_headers include/gc_config.h include/gc_ext_config.h" ac_config_files="$ac_config_files Makefile include/Makefile" @@ -7178,6 +7178,7 @@ do "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "include/gc_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/gc_config.h" ;; + "include/gc_ext_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/gc_ext_config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; diff --git a/boehm-gc/configure.ac b/boehm-gc/configure.ac index 7d1c6e3df1b..208a9160872 100644 --- a/boehm-gc/configure.ac +++ b/boehm-gc/configure.ac @@ -468,7 +468,7 @@ else multilib_arg= fi -AC_CONFIG_HEADERS([include/gc_config.h]) +AC_CONFIG_HEADERS([include/gc_config.h include/gc_ext_config.h]) AC_CONFIG_FILES(Makefile include/Makefile) AC_OUTPUT diff --git a/boehm-gc/include/gc.h b/boehm-gc/include/gc.h index e1f2aa8f80f..0781a611bb0 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 00000000000..52a662dcf0b --- /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 |