From 350138ba1d27c8494e0e8a593f290711aec8d4db Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Tue, 5 Dec 2000 23:06:32 +0000 Subject: [PATCH] acinclude.m4: Change up to reflect new directory organization. 2000-12-05 Benjamin Kosnik * acinclude.m4: Change up to reflect new directory organization. Add in bits for NetBSD. * aclocal.m4: Regenerate. * configure: Regenerate. * config/os/bsd: New directory. * config/os/netbsd: Move to... * config/os/bsd/netbsd: ...here. * config/os/freebsd: Move to... * config/os/bsd/freebsd: ...here. From-SVN: r38054 --- .../config/os/freebsd/bits/ctype_base.h | 77 ------------------ .../config/os/freebsd/bits/ctype_inline.h | 78 ------------------- .../config/os/freebsd/bits/ctype_noninline.h | 71 ----------------- .../config/os/freebsd/bits/os_defines.h | 41 ---------- 4 files changed, 267 deletions(-) delete mode 100644 libstdc++-v3/config/os/freebsd/bits/ctype_base.h delete mode 100644 libstdc++-v3/config/os/freebsd/bits/ctype_inline.h delete mode 100644 libstdc++-v3/config/os/freebsd/bits/ctype_noninline.h delete mode 100644 libstdc++-v3/config/os/freebsd/bits/os_defines.h diff --git a/libstdc++-v3/config/os/freebsd/bits/ctype_base.h b/libstdc++-v3/config/os/freebsd/bits/ctype_base.h deleted file mode 100644 index ea97e91a781..00000000000 --- a/libstdc++-v3/config/os/freebsd/bits/ctype_base.h +++ /dev/null @@ -1,77 +0,0 @@ -// Locale support -*- C++ -*- - -// Copyright (C) 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: 22.1 Locales -// - -// Information as gleaned from /usr/include/ctype.h on FreeBSD 3.4, -// 4.0 and all versions of the CVS managed file at: -// :pserver:anoncvs@anoncvs.freebsd.org:/home/ncvs/src/include/ctype.h - - struct ctype_base - { - typedef unsigned long mask; - // Non-standard typedefs. - typedef const int* __to_type; - - enum - { -#ifdef _CTYPE_S - // FreeBSD 4.0 uses this style of define. - space = _CTYPE_S, - print = _CTYPE_R, - cntrl = _CTYPE_C, - upper = _CTYPE_U, - lower = _CTYPE_L, - alpha = _CTYPE_A, - digit = _CTYPE_D, - punct = _CTYPE_P, - xdigit = _CTYPE_X, - alnum = _CTYPE_A | _CTYPE_D, - graph = _CTYPE_G -#else - // Older versions, including Free BSD 3.4, use this style of define. - space = _S, - print = _R, - cntrl = _C, - upper = _U, - lower = _L, - alpha = _A, - digit = _D, - punct = _P, - xdigit = _X, - alnum = _A | _D, - graph = _G -#endif - }; - }; - - - diff --git a/libstdc++-v3/config/os/freebsd/bits/ctype_inline.h b/libstdc++-v3/config/os/freebsd/bits/ctype_inline.h deleted file mode 100644 index 92ffe703fd6..00000000000 --- a/libstdc++-v3/config/os/freebsd/bits/ctype_inline.h +++ /dev/null @@ -1,78 +0,0 @@ -// Locale support -*- C++ -*- - -// Copyright (C) 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: 22.1 Locales -// - -// ctype bits to be inlined go here. Non-inlinable (ie virtual do_*) -// functions go in ctype.cc - - bool - ctype:: - is(mask __m, char __c) const throw() - { - if (__m & (digit | xdigit)) - return __isctype(__c, __m); - else - return __istype(__c, __m); - } - - const char* - ctype:: - is(const char* __low, const char* __high, mask* __vec) const throw() - { - // XXX - while (__low < __high) - *__vec++ = _M_table[(unsigned char)(*__low++)]; - return __high; - } - - const char* - ctype:: - scan_is(mask __m, const char* __low, const char* __high) const throw() - { - while (__low < __high && !this->is(__m, *__low)) - ++__low; - return __low; - } - - const char* - ctype:: - scan_not(mask __m, const char* __low, const char* __high) const throw() - { - while (__low < __high && this->is(__m, *__low) != 0) - ++__low; - return __low; - } - - - - - diff --git a/libstdc++-v3/config/os/freebsd/bits/ctype_noninline.h b/libstdc++-v3/config/os/freebsd/bits/ctype_noninline.h deleted file mode 100644 index 24fdcdb23ea..00000000000 --- a/libstdc++-v3/config/os/freebsd/bits/ctype_noninline.h +++ /dev/null @@ -1,71 +0,0 @@ -// Locale support -*- C++ -*- - -// Copyright (C) 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: 22.1 Locales -// - -// Information as gleaned from /usr/include/ctype.h - - ctype::ctype(const mask* __table = 0, bool __del = false, - size_t __refs = 0) - : _Ctype_nois(__refs), _M_del(__table != 0 && __del), - _M_toupper(NULL), _M_tolower(NULL), - _M_ctable(NULL), _M_table(__table == 0 ? _M_ctable: __table) - { } - - char - ctype::do_toupper(char __c) const - { return ::toupper((int) __c); } - - const char* - ctype::do_toupper(char* __low, const char* __high) const - { - while (__low < __high) - { - *__low = ::toupper((int) *__low); - ++__low; - } - return __high; - } - - char - ctype::do_tolower(char __c) const - { return ::tolower((int) __c); } - - const char* - ctype::do_tolower(char* __low, const char* __high) const - { - while (__low < __high) - { - *__low = ::tolower((int) *__low); - ++__low; - } - return __high; - } diff --git a/libstdc++-v3/config/os/freebsd/bits/os_defines.h b/libstdc++-v3/config/os/freebsd/bits/os_defines.h deleted file mode 100644 index 1cb71d149ec..00000000000 --- a/libstdc++-v3/config/os/freebsd/bits/os_defines.h +++ /dev/null @@ -1,41 +0,0 @@ -// Specific definitions for BSD -*- C++ -*- - -// Copyright (C) 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. - - -#ifndef _GLIBCPP_OS_DEFINES -# define _GLIBCPP_OS_DEFINES - - -/* System-specific #define, typedefs, corrections, etc, go here. This - file will come before all others. */ - - -#endif - -