* _G_config.h (_G_USING_THUNKS): Allow overrides from

	OS-configuration files.
	* libioP.h: Test _G_USING_THUNKS with #if, rather than #ifdef.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37130 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/libio/ChangeLog b/libstdc++-v3/libio/ChangeLog
index 9736beb..f4e7664 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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);