diff options
| author |   niklas <niklas@openbsd.org> | 1996-02-18 00:35:52 +0000 |
|---|---|---|
| committer | niklas <niklas@openbsd.org> | 1996-02-18 00:35:52 +0000 |
| commit | 8933f4aa9c5daefb0429ee844c9593c0fc53d544 (patch) | |
| tree | ae98e1cab83aa5ff80db2ad251f818aafd1ba7b9 | |
| parent | From netbsd: (diff) | |
| download | wireguard-openbsd-8933f4aa9c5daefb0429ee844c9593c0fc53d544.tar.xz wireguard-openbsd-8933f4aa9c5daefb0429ee844c9593c0fc53d544.zip | |
Check the for GCC >= 3.X (no it's not even started on yet :-) ) in the
name mangling dependent code.
| -rw-r--r-- | gnu/lib/libg++/iostream/stdstrbufs.C | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gnu/lib/libg++/iostream/stdstrbufs.C b/gnu/lib/libg++/iostream/stdstrbufs.C index 8888d22facf..a95afc315cf 100644 --- a/gnu/lib/libg++/iostream/stdstrbufs.C +++ b/gnu/lib/libg++/iostream/stdstrbufs.C @@ -16,7 +16,8 @@ // Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include "ioprivate.h" -#include <stdio.h> +#include <std +io.h> // This file defines the standard streambufs, corresponding to cin, cout, cerr. // We define two sets: @@ -53,13 +54,15 @@ #define vt_filebuf __vtbl__7filebuf extern char vt_filebuf[1]; #elif _G_DOLLAR_IN_LABEL -#if __GNUC_MINOR__ >= 5 // XXX I'm not sure it was introduced in 2.5 +#if __GNUC_MAJOR__ > 2 || __GNUC_MINOR__ >= 5 // XXX I'm not sure it was + // introduced in 2.5 extern char vt_filebuf[1] asm(UNDERSCORE "_vt$7filebuf"); #else extern char vt_filebuf[1] asm(UNDERSCORE "_vt$filebuf"); #endif #else -#if __GNUC_MINOR__ >= 5 // XXX I'm not sure it was introduced in 2.5 +#if __GNUC_MAJOR__ > 2 || __GNUC_MINOR__ >= 5 // XXX I'm not sure it was + // introduced in 2.5 extern char vt_filebuf[1] asm(UNDERSCORE "_vt.7filebuf"); #else extern char vt_filebuf[1] asm(UNDERSCORE "_vt.filebuf"); @@ -93,13 +96,15 @@ DEF_FILEBUF(__std_filebuf_2, 2, (streambuf*)&__std_filebuf_1, #define vt_stdiobuf __vtbl__8stdiobuf extern char vt_stdiobuf[1]; #elif _G_DOLLAR_IN_LABEL -#if __GNUC_MINOR__ >= 5 // XXX I'm not sure it was introduced in 2.5 +#if __GNUC_MAJOR__ > 2 || __GNUC_MINOR__ >= 5 // XXX I'm not sure it was + // introduced in 2.5 extern char vt_stdiobuf[1] asm(UNDERSCORE "_vt$8stdiobuf"); #else extern char vt_stdiobuf[1] asm(UNDERSCORE "_vt$stdiobuf"); #endif #else -#if __GNUC_MINOR__ >= 5 // XXX I'm not sure it was introduced in 2.5 +#if __GNUC_MAJOR__ > 2 || __GNUC_MINOR__ >= 5 // XXX I'm not sure it was + // introduced in 2.5 extern char vt_stdiobuf[1] asm(UNDERSCORE "_vt.8stdiobuf"); #else extern char vt_stdiobuf[1] asm(UNDERSCORE "_vt.stdiobuf"); |