diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-09-25 14:42:18 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-09-25 14:42:18 +0000 |
commit | aeb5b827c5f7ed858a5b15101d1a3893356cc6ba (patch) | |
tree | 5d8e4382197847df3cf875caac4994390b6f1094 /libc/sysdeps/generic/_G_config.h | |
parent | 598804b7d4191eddbaf24784c3b25a6c4d6f33cd (diff) | |
download | eglibc2-aeb5b827c5f7ed858a5b15101d1a3893356cc6ba.tar.gz |
Merge changes between r20391 and r20863 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@20864 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/generic/_G_config.h')
-rw-r--r-- | libc/sysdeps/generic/_G_config.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/libc/sysdeps/generic/_G_config.h b/libc/sysdeps/generic/_G_config.h index 6f756829e..fc83565b9 100644 --- a/libc/sysdeps/generic/_G_config.h +++ b/libc/sysdeps/generic/_G_config.h @@ -18,7 +18,6 @@ # define __need_wint_t #endif #include <wchar.h> -#define _G_size_t size_t typedef struct { __off_t __pos; @@ -29,13 +28,7 @@ typedef struct __off64_t __pos; __mbstate_t __state; } _G_fpos64_t; -#define _G_ssize_t __ssize_t -#define _G_off_t __off_t #define _G_off64_t __off_t -#define _G_pid_t __pid_t -#define _G_uid_t __uid_t -#define _G_wchar_t wchar_t -#define _G_wint_t wint_t #define _G_stat64 stat #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T # include <gconv.h> @@ -50,25 +43,11 @@ typedef union } _G_iconv_t; #endif -typedef int _G_int16_t __attribute__ ((__mode__ (__HI__))); -typedef int _G_int32_t __attribute__ ((__mode__ (__SI__))); -typedef unsigned int _G_uint16_t __attribute__ ((__mode__ (__HI__))); -typedef unsigned int _G_uint32_t __attribute__ ((__mode__ (__SI__))); - -#define _G_HAVE_BOOL 1 - /* These library features are always available in the GNU C library. */ -#define _G_HAVE_ATEXIT 1 -#define _G_HAVE_SYS_WAIT 1 -#define _G_NEED_STDARG_H 1 #define _G_va_list __gnuc_va_list -#define _G_HAVE_PRINTF_FP 1 #define _G_HAVE_MMAP 1 -#define _G_HAVE_LONG_DOUBLE_IO 1 -#define _G_HAVE_IO_FILE_OPEN 1 -#define _G_HAVE_IO_GETLINE_INFO 1 #define _G_IO_IO_FILE_VERSION 0x20001 @@ -77,9 +56,4 @@ typedef unsigned int _G_uint32_t __attribute__ ((__mode__ (__SI__))); #define _G_BUFSIZ 8192 -/* These are the vtbl details for ELF. */ -#define _G_NAMES_HAVE_UNDERSCORE 0 -#define _G_VTABLE_LABEL_PREFIX "_vt." -#define _G_VTABLE_LABEL_HAS_LENGTH 1 - #endif /* _G_config.h */ |