a6863e2538
2000-10-10 Benjamin Kosnik <bkoz@purist.soma.redhat.com> * Makefile.am (LIBSUPCXX_INCLUDES): Adjust. * libsupc++/include: Remove * libsupc++/include/*: Move to ... * libsupc++: Here. * libsupc++/Makefile.am (glibcppinstall_HEADERS): Install headers. (glibcppinstalldir): New. * src/Makefile.am (c_base_headers): New. (c_shadow_headers): New (c_headers): New. (myinstallheaders): Correct install issues. * src/Makefile.in: Regenerate. * Makefile.am (CSHADOW_INCLUDES): Simplify. * Makefile.in: Regenerate. * acinclude.m4 (GLIBCPP_ENABLE_SHADOW): Add c_include_dir. * aclocal.m4: Regenerate. * mkcheck.in (SRC_DIR): Use it. * include/bits/std_stdexcept.h: And here. * include/bits/std_ios.h: Change std_exception.h to exception. * src/locale.cc: And here. * src/locale-inst.cc: And here. * include/bits/valarray_array.h: And here. * include/bits/stl_alloc.h: And here. * include/bits/stl_algobase.h: And here. * include/bits/pthread_allocimpl.h: And here. * include/bits/stl_construct.h: Change to std_new.h to new. * include/bits/locale_facets.h: Change std_typeinfo.h to typeinfo. * src/Makefile.am (INCLUDES): Add LIBSUPCXX_INCLUDES. (headers): Remove duplicated headers. (std_headers): And here. * src/Makefile.in: Regenerate. * libsupc++/Makefile.am (LIBSUPCXX_INCLUDES): Remove. * libsupc++/Makefile.in: Regenerate. * Makefile.am (LIBSUPCXX_INCLUDES): Add here. (AM_MAKEFLAGS): And here. * Makefile.in: Regenerate. * include/bits/std_typeinfo.h: Remove. * include/bits/std_new.h: Remove * include/bits/std_exception.h: Remove. * std/new: Remove. * std/typeinfo: Remove. * std/exception: Remove. * libio/_G_config.h (__need_ptrdiff_t): Add. * libsupc++/include/new: Change stddef.h to cstddef. * libsupc++/tinfo.h: Change limits.h to climits. * libsupc++/pure.cc: Comment out _GNU_LIBRARY_ bits, as this renders the file uncompilable. Add copyright. * include/c_std/bits/std_cstddef.h: Don't bring wchar_t into std namespace, as it is a fundamental type. From-SVN: r36833
133 lines
3.1 KiB
C
133 lines
3.1 KiB
C
/* This file is needed by libio to define various configuration parameters.
|
|
These are always the same in the GNU C library. */
|
|
|
|
#ifndef _G_config_h
|
|
#define _G_config_h 1
|
|
|
|
#ifndef _LIBC
|
|
# include <bits/c++config.h>
|
|
# define _IO_MTSAFE_IO
|
|
#endif
|
|
|
|
/* Define types for libio in terms of the standard internal type names. */
|
|
|
|
#include <sys/types.h>
|
|
#define __need_size_t
|
|
#define __need_wchar_t
|
|
#define __need_wint_t
|
|
#define __need_NULL
|
|
#define __need_ptrdiff_t
|
|
#ifdef __cplusplus
|
|
# include <cstddef>
|
|
#else
|
|
# include <stddef.h>
|
|
#endif
|
|
|
|
|
|
#ifndef _WINT_T
|
|
/* Integral type unchanged by default argument promotions that can
|
|
hold any value corresponding to members of the extended character
|
|
set, as well as at least one value that does not correspond to any
|
|
member of the extended character set. */
|
|
# define _WINT_T
|
|
typedef unsigned int wint_t;
|
|
#endif
|
|
|
|
/* For use as part of glibc (native) or as part of libstdc++ (maybe
|
|
not glibc) */
|
|
#ifndef __mbstate_t_defined
|
|
# define __mbstate_t_defined 1
|
|
# ifdef _GLIBCPP_USE_WCHAR_T
|
|
typedef struct
|
|
{
|
|
int count;
|
|
wint_t value;
|
|
}__mbstate_t;
|
|
# endif
|
|
#endif
|
|
#undef __need_mbstate_t
|
|
|
|
typedef size_t _G_size_t;
|
|
|
|
|
|
#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
|
|
typedef struct
|
|
{
|
|
__off_t __pos;
|
|
__mbstate_t __state;
|
|
} _G_fpos_t;
|
|
|
|
typedef struct
|
|
{
|
|
__off64_t __pos;
|
|
__mbstate_t __state;
|
|
} _G_fpos64_t;
|
|
#else
|
|
typedef __off_t _G_fpos_t;
|
|
typedef __off64_t _G_fpos64_t;
|
|
#endif
|
|
#define _G_ssize_t __ssize_t
|
|
#define _G_off_t __off_t
|
|
#define _G_off64_t __off64_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 stat64
|
|
#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
|
|
# include <iconv.h>
|
|
typedef iconv_t _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_CDEFS 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
|
|
|
|
//#define _G_OPEN64 __open64
|
|
//#define _G_LSEEK64 __lseek64
|
|
//#define _G_FSTAT64(fd,buf) __fxstat64 (_STAT_VER, fd, buf)
|
|
|
|
/* This is defined by <bits/stat.h> if `st_blksize' exists. */
|
|
/*#define _G_HAVE_ST_BLKSIZE defined (_STATBUF_ST_BLKSIZE)*/
|
|
|
|
#define _G_BUFSIZ 8192
|
|
|
|
/* 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
|
|
#define _G_VTABLE_LABEL_PREFIX "__vt_"
|
|
#define _G_VTABLE_LABEL_PREFIX_ID __vt_
|
|
|
|
#define _G_INTERNAL_CCS "UCS4"
|
|
#define _G_HAVE_WEAK_SYMBOL 1
|
|
#define _G_STDIO_USES_LIBIO 1
|
|
|
|
#if defined __cplusplus || defined __STDC__
|
|
# define _G_ARGS(ARGLIST) ARGLIST
|
|
#else
|
|
# define _G_ARGS(ARGLIST) ()
|
|
#endif
|
|
|
|
#endif /* _G_config.h */
|
|
|