From 23db182d85e44dec6e16c24b9023f1fefc84b68b Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Wed, 10 Nov 2004 19:43:14 +0000 Subject: [PATCH] - deactivate vtable-thunks, as BeOS never used them and we need to be compatible; change vtable-label-prefix accordingly. - removed inclusion of wchar.h, as this breaks the libstdc++-build (hopefully this doesn't break anything ?!?) git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9903 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/libroot/posix/glibc/libio/_G_config.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/kernel/libroot/posix/glibc/libio/_G_config.h b/src/kernel/libroot/posix/glibc/libio/_G_config.h index e35e77dffb..f12735951c 100644 --- a/src/kernel/libroot/posix/glibc/libio/_G_config.h +++ b/src/kernel/libroot/posix/glibc/libio/_G_config.h @@ -26,7 +26,7 @@ # include #endif -#include +//#include #ifndef _WINT_T /* Integral type unchanged by default argument promotions that can @@ -127,11 +127,12 @@ 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 -#ifndef _G_USING_THUNKS -# define _G_USING_THUNKS 1 +// avoid vtable-thunks, as BeOS never used those: +#ifdef _G_USING_THUNKS +#undef _G_USING_THUNKS #endif /* _G_USING_THUNKS */ -#define _G_VTABLE_LABEL_PREFIX "__vt_" -#define _G_VTABLE_LABEL_PREFIX_ID __vt_ +#define _G_VTABLE_LABEL_PREFIX "_vt." +#define _G_VTABLE_LABEL_PREFIX_ID _vt. #define _G_INTERNAL_CCS "UCS4" #define _G_HAVE_WEAK_SYMBOL 1