mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-26 07:58:57 +08:00
0517cb9903
2000-10-02 Steven King <sxking@uswest.net>
* mkcshadow: Fixed script to output proper include guard.
* bits/char_traits.h: Cleaned up types in char_traits<char> functions.
* libio/_G_config.h: Hacked to make work with shadow heraders.
* shadow/*: Hacked to make shadow headers work.
2000-10-02 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
Self-compile with shadow headers.
* acconfig.h (_GLIBCPP_USE_SHADOW_HEADERS): Define. Eventually,
like _GLIBCPP_USE_NAMESPACES before it, this macro will die when
it becomes the default way the library is built.
* acinclude.m4 (GLIBCPP_ENABLE_SHADOW): New macro.
* config/gnu-linux/bits/ctype_base.h (ctype_base): Use it.
* config/gnu-linux/ctype.cc (ctype): Use it.
* src/localename.cc (locale::_Impl::_M_replace_categories): Remove
call to assert.
* src/locale.cc: Explicitly cast mbstate_t to void* in calls to
memset. This should not be necessary, but an ambiguous overload
with it in.
* shadow/bits/std_cwchar.h: Fix.
* shadow/wchar.h: Fix.
* config/gnu-linux/bits/ctype_base.h (ctype_base): Inject ctype
enums into namespace std:: for ctype_base enum. Other OS types
will have to do this as well.
* config/gnu-linux/ctype.cc (ctype): Inject ctype data into
namespace std, in particular __ctype_toupper, __ctype_tolower,
__ctype_b.
* shadow/iolibio.h: New file.
* shadow/bits/wrap_iolibio.h: New file.
* shadow/libioP.h: New file.
* shadow/bits/wrap_libioP.h: New file.
* shadow/bits/wrap_fcntl.h: New file.
* shadow/fcntl.h: New file.
* shadow/iconv.h: New file. Inject iconv names into the global
namespace, unmangled for the moment.
* shadow/bits/wrap_iconv.h: New file.
* shadow/unistd.h: Remove. Useless.
* shadow/bits/wrap_unistd.h: Remove.
* src/Makefile.am: Take out machine-ansi.h, add fcntl.h unistd.h.
* src/Makefile.in: Regenerate.
* config/c_io_libio.h (_IO_codecvt): Change to normal C++ decl.
* shadow/libio.h: Fix.
* shadow/bits/wrap_libio.h: Fix.
* shadow/bits/std_clocale.h: Remove typedef struct construct,
which will not compile.
* shadow/bits/std_ctime.h: Same.
* shadow/pthread.h: New file. Put pthreads types and functions
into global scope, which is probably not the correct long-term
solution but has to be done at the moment before libio wrappers
can even be started.
* shadow/bits/wrap_pthread.h: New file.
* bits/std_ios.h: Formatting tweak.
* shadow/bits/std_cstdio.h: Format. Remove extraneous bits.
* acinclude.m4 (GLIBCPP_CHECK_COMPILER_FEATURES): Add -Werror to
tests for compiler features.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* config/c_io_libio.cc: Remove fcntl.h include, as SEEK_SET
redefined.
* libio/libioP.h: Comment out fcntl.h include.
* shadow/math.h: Add in float and long declarations, as per ISO C9X.
* bits/c++config: Define _ISOC99_SOURCE.
* acinclude.m4 (GLIBCPP_ENABLE_SHADOW): Add -fno-builtins to
CSHADOWFLAGS, as well as _ISOC99_SOURCE.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* src/Makefile.am (CSHADOW_INCLUDES): Enable, again.
(CSHADOW_INCLUDES): Add -I$(top_srcdir)/std before shadow include dir.
(CXXCOMPILE): Remove $(DEFS), which searches $(top_srcdir) before
std or shadow directories.
(LTCXXCOMPILE): Same.
(INCLUDES): Add $(top_builddir) before $(top_srcdir).
(AC_CXXFLAGS): Add CSHADOWFLAGS.
* src/Makefile.in: Regenerate.
* src/complex.cc (FCT): Change ::name to name.
* src/complexl.cc (FCT): Same. Use _GLIBCPP_USE_LONG_LONG here.
* src/complexf.cc (FCT): Same.
* src/complexf.cc: Remove FCT define, as things are properly
overloaded in the std namespace with the shadow headers.
* src/complexl.cc: Same.
* src/complex.cc: Same.
From-SVN: r36707
192 lines
4.7 KiB
C++
192 lines
4.7 KiB
C++
// -*- C++ -*- header wrapper
|
|
|
|
// Copyright (C) 1997-1999, 2000 Free Software Foundation, Inc.
|
|
//
|
|
// This file is part of the GNU ISO C++ Library. This library is free
|
|
// software; you can redistribute it and/or modify it under the
|
|
// terms of the GNU General Public License as published by the
|
|
// Free Software Foundation; either version 2, or (at your option)
|
|
// any later version.
|
|
|
|
// This library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License along
|
|
// with this library; see the file COPYING. If not, write to the Free
|
|
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
|
// USA.
|
|
|
|
// As a special exception, you may use this file as part of a free software
|
|
// library without restriction. Specifically, if other files instantiate
|
|
// templates or use macros or inline functions from this file, or you compile
|
|
// this file and link it with other files to produce an executable, this
|
|
// file does not by itself cause the resulting executable to be covered by
|
|
// the GNU General Public License. This exception does not however
|
|
// invalidate any other reasons why the executable file might be covered by
|
|
// the GNU General Public License.
|
|
|
|
//
|
|
// ISO C++ 14882: 20.4.6 C library
|
|
//
|
|
|
|
// Function decls in this header are overloaded on the
|
|
// extern "C"-ness of arguments. This is a rich ground
|
|
// for compiler bugs.
|
|
|
|
#ifndef _CPP_CSTDLIB
|
|
#define _CPP_CSTDLIB 1
|
|
|
|
# include <bits/c++config.h>
|
|
# include <bits/std_cstddef.h>
|
|
|
|
namespace _C_legacy {
|
|
extern "C" {
|
|
# define _IN_C_LEGACY_
|
|
# pragma GCC system_header
|
|
# include_next <stdlib.h>
|
|
typedef int (*_C_cmp_fun_ptr)(const void*, const void*); // C fn ptr
|
|
}
|
|
|
|
typedef div_t _CPP_div_t_capture;
|
|
typedef ldiv_t _CPP_ldiv_t_capture;
|
|
|
|
# if _GLIBCPP_HAVE_LLDIV_T
|
|
typedef lldiv_t _CPP_lldiv_t_capture;
|
|
# endif
|
|
} // namespace _C_legacy
|
|
|
|
# undef size_t
|
|
# undef wchar_t
|
|
# undef div_t
|
|
# undef ldiv_t
|
|
|
|
# undef atof
|
|
# undef atoi
|
|
# undef atol
|
|
# undef strtod
|
|
# undef strtol
|
|
# undef strtoul
|
|
# undef rand
|
|
# undef srand
|
|
# undef calloc
|
|
# undef free
|
|
# undef malloc
|
|
# undef realloc
|
|
# undef abort
|
|
# undef atexit
|
|
# undef exit
|
|
# undef getenv
|
|
# undef system
|
|
# undef bsearch
|
|
# undef qsort
|
|
# undef abs
|
|
# undef div
|
|
# undef labs
|
|
# undef ldiv
|
|
#ifdef _GLIBCPP_USE_LONG_LONG
|
|
# undef llabs
|
|
# undef lldiv
|
|
#endif
|
|
# undef mblen
|
|
# undef mbtowc
|
|
# undef wctomb
|
|
# undef mbstowcs
|
|
# undef wcstombs
|
|
|
|
namespace std {
|
|
struct div_t : _C_legacy::_CPP_div_t_capture { };
|
|
struct ldiv_t : _C_legacy::_CPP_ldiv_t_capture { };
|
|
|
|
#ifdef _GLIBCPP_USE_LONG_LONG
|
|
# ifdef _GLIBCPP_HAVE_LLDIV_T
|
|
struct lldiv_t : _C_legacy::_CPP_lldiv_t_captur { };
|
|
# else
|
|
struct lldiv_t
|
|
{
|
|
long long quot;
|
|
long long rem;
|
|
};
|
|
# endif
|
|
#endif
|
|
|
|
using _C_legacy::atof;
|
|
using _C_legacy::atoi;
|
|
using _C_legacy::atol;
|
|
using _C_legacy::strtod;
|
|
using _C_legacy::strtol;
|
|
using _C_legacy::strtoul;
|
|
using _C_legacy::rand;
|
|
using _C_legacy::srand;
|
|
using _C_legacy::calloc;
|
|
using _C_legacy::free;
|
|
using _C_legacy::malloc;
|
|
using _C_legacy::realloc;
|
|
|
|
using _C_legacy::abort;
|
|
using _C_legacy::atexit;
|
|
using _C_legacy::exit;
|
|
using _C_legacy::bsearch;
|
|
using _C_legacy::qsort;
|
|
|
|
using _C_legacy::getenv;
|
|
using _C_legacy::system;
|
|
using _C_legacy::mbtowc;
|
|
using _C_legacy::wctomb;
|
|
using _C_legacy::mbstowcs;
|
|
using _C_legacy::wcstombs;
|
|
|
|
#ifdef _GLIBCPP_USE_LONG_LONG
|
|
using _C_legacy::strtoll;
|
|
using _C_legacy::strtoull;
|
|
using _C_legacy::strtof;
|
|
using _C_legacy::strtold;
|
|
#endif
|
|
|
|
using _C_legacy::mblen;
|
|
|
|
inline int
|
|
abs(int __x) { return __x >= 0 ? __x : -__x; }
|
|
|
|
inline div_t
|
|
div(int __n, int __d)
|
|
{ div_t __q; __q.quot = __n / __d; __q.rem = __n % __d; return __q; }
|
|
|
|
inline long
|
|
labs(long __x) { return __x >= 0 ? __x : -__x; }
|
|
|
|
inline long
|
|
abs(long __x) { return __x >= 0 ? __x : -__x; }
|
|
|
|
inline ldiv_t
|
|
ldiv(long __n, long __d)
|
|
{ ldiv_t __q; __q.quot = __n / __d; __q.rem = __n % __d; return __q; }
|
|
|
|
inline ldiv_t
|
|
div(long __n, long __d)
|
|
{ ldiv_t __q; __q.quot = __n / __d; __q.rem = __n % __d; return __q; }
|
|
|
|
#ifdef _GLIBCPP_USE_LONG_LONG
|
|
inline long long
|
|
llabs(long long __x) { return __x >= 0 ? __x : -__x; }
|
|
|
|
inline long long
|
|
abs(long long __x) { return __x >= 0 ? __x : -__x; }
|
|
|
|
inline lldiv_t
|
|
lldiv(long long __n, long long __d)
|
|
{ lldiv_t __q; __q.quot = __n / __d; __q.rem = __n % __d; return __q; }
|
|
|
|
inline lldiv_t
|
|
div(long long __n, long long __d)
|
|
{ lldiv_t __q; __q.quot = __n / __d; __q.rem = __n % __d; return __q; }
|
|
#endif
|
|
} // namespace std
|
|
|
|
# undef _IN_C_LEGACY_
|
|
|
|
#endif
|
|
|
|
|