diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2000-10-29 21:21:51 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2000-10-29 21:21:51 +0000 |
| commit | f80c00cc55fcf0c5b51187a818575af01ab6b0c7 (patch) | |
| tree | 2ed0efe5e5512939c099bdc8d6d63ff56dbdbbdb | |
| parent | 9ece5af645c39e4fd558fc9c473ddc09ca941fb9 (diff) | |
| download | gcc-f80c00cc55fcf0c5b51187a818575af01ab6b0c7.zip gcc-f80c00cc55fcf0c5b51187a818575af01ab6b0c7.tar.gz gcc-f80c00cc55fcf0c5b51187a818575af01ab6b0c7.tar.bz2 | |
_G_config.h (_G_USING_THUNKS): Allow overrides from OS-configuration files.
* _G_config.h (_G_USING_THUNKS): Allow overrides from
OS-configuration files.
* libioP.h: Test _G_USING_THUNKS with #if, rather than #ifdef.
From-SVN: r37130
| -rw-r--r-- | libstdc++-v3/libio/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/libio/_G_config.h | 4 | ||||
| -rw-r--r-- | libstdc++-v3/libio/libioP.h | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/libstdc++-v3/libio/ChangeLog b/libstdc++-v3/libio/ChangeLog index 9736beb..f4e7664 100644 --- a/libstdc++-v3/libio/ChangeLog +++ b/libstdc++-v3/libio/ChangeLog @@ -1,3 +1,9 @@ +2000-10-29 Mark Mitchell <mark@codesourcery.com> + + * _G_config.h (_G_USING_THUNKS): Allow overrides from + OS-configuration files. + * libioP.h: Test _G_USING_THUNKS with #if, rather than #ifdef. + 2000-10-17 Benjamin Kosnik <bkoz@gnu.org> * libioP.h: Break up extern "C" bits around includes. diff --git a/libstdc++-v3/libio/_G_config.h b/libstdc++-v3/libio/_G_config.h index 4e79f74..d6738c2 100644 --- a/libstdc++-v3/libio/_G_config.h +++ b/libstdc++-v3/libio/_G_config.h @@ -116,7 +116,9 @@ typedef unsigned int _G_uint32_t __attribute__ ((__mode__ (__SI__))); /* These are the vtbl details for ELF. */ #define _G_NAMES_HAVE_UNDERSCORE 0 #define _G_VTABLE_LABEL_HAS_LENGTH 1 -#define _G_USING_THUNKS 1 +#ifndef _G_USING_THUNKS +# define _G_USING_THUNKS 1 +#endif /* _G_USING_THUNKS */ #define _G_VTABLE_LABEL_PREFIX "__vt_" #define _G_VTABLE_LABEL_PREFIX_ID __vt_ diff --git a/libstdc++-v3/libio/libioP.h b/libstdc++-v3/libio/libioP.h index 598949d..4aecf4e 100644 --- a/libstdc++-v3/libio/libioP.h +++ b/libstdc++-v3/libio/libioP.h @@ -82,7 +82,7 @@ extern "C" { # define _IO_JUMPS_FUNC(THIS) _IO_JUMPS ((struct _IO_FILE_plus *) (THIS)) #endif #define _IO_WIDE_JUMPS_FUNC(THIS) _IO_WIDE_JUMPS(THIS) -#ifdef _G_USING_THUNKS +#if _G_USING_THUNKS # define JUMP_FIELD(TYPE, NAME) TYPE NAME # define JUMP0(FUNC, THIS) _IO_JUMPS_FUNC(THIS)->FUNC (THIS) # define JUMP1(FUNC, THIS, X1) _IO_JUMPS_FUNC(THIS)->FUNC (THIS, X1) @@ -274,7 +274,7 @@ typedef void (*_IO_imbue_t) __PMT ((_IO_FILE *, void *)); struct _IO_jump_t { JUMP_FIELD(_G_size_t, __dummy); -#ifdef _G_USING_THUNKS +#if _G_USING_THUNKS JUMP_FIELD(_G_size_t, __dummy2); #endif JUMP_FIELD(_IO_finish_t, __finish); |