From 311635d10343023d65e97d2fbb31a93e4b40090d Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Fri, 2 Feb 2007 14:49:52 +0000 Subject: [PATCH] c++config: Consistent macro guards for config includes. 2007-02-02 Benjamin Kosnik * include/bits/c++config: Consistent macro guards for config includes. * config/locale/gnu/c_locale.h: Same. * config/locale/generic/c_locale.h: Same. * config/allocator/mt_allocator_base.h: Same. * config/allocator/malloc_allocator_base.h: Same. * config/allocator/new_allocator_base.h: Same. * config/allocator/pool_allocator_base.h: Same. * config/allocator/bitmap_allocator_base.h: Same. * config/os/vxworks/os_defines.h: Same. * config/cpu/sh/atomicity.h: Same. * config/io/c_io_stdio.h: Same. * config/io/basic_file_stdio.h: Same. From-SVN: r121502 --- libstdc++-v3/ChangeLog | 15 +++++++++++++++ .../config/allocator/bitmap_allocator_base.h | 4 ++-- .../config/allocator/malloc_allocator_base.h | 4 ++-- libstdc++-v3/config/allocator/mt_allocator_base.h | 4 ++-- .../config/allocator/new_allocator_base.h | 4 ++-- .../config/allocator/pool_allocator_base.h | 4 ++-- libstdc++-v3/config/cpu/sh/atomicity.h | 10 +++++----- libstdc++-v3/config/io/basic_file_stdio.h | 4 ++-- libstdc++-v3/config/io/c_io_stdio.h | 4 ++-- libstdc++-v3/config/locale/generic/c_locale.h | 4 ++-- libstdc++-v3/config/locale/gnu/c_locale.h | 4 ++-- libstdc++-v3/config/os/vxworks/os_defines.h | 4 ++-- libstdc++-v3/include/bits/c++config | 8 ++++---- 13 files changed, 44 insertions(+), 29 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index bf45d8ebff1..4af578769cb 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,18 @@ +2007-02-02 Benjamin Kosnik + + * include/bits/c++config: Consistent macro guards for config includes. + * config/locale/gnu/c_locale.h: Same. + * config/locale/generic/c_locale.h: Same. + * config/allocator/mt_allocator_base.h: Same. + * config/allocator/malloc_allocator_base.h: Same. + * config/allocator/new_allocator_base.h: Same. + * config/allocator/pool_allocator_base.h: Same. + * config/allocator/bitmap_allocator_base.h: Same. + * config/os/vxworks/os_defines.h: Same. + * config/cpu/sh/atomicity.h: Same. + * config/io/c_io_stdio.h: Same. + * config/io/basic_file_stdio.h: Same. + 2007-02-01 Paolo Carlini PR libstdc++/14493 diff --git a/libstdc++-v3/config/allocator/bitmap_allocator_base.h b/libstdc++-v3/config/allocator/bitmap_allocator_base.h index 36727a9582a..d33025e1dc8 100644 --- a/libstdc++-v3/config/allocator/bitmap_allocator_base.h +++ b/libstdc++-v3/config/allocator/bitmap_allocator_base.h @@ -32,8 +32,8 @@ * You should not attempt to use it directly. */ -#ifndef _CXX_ALLOCATOR_H -#define _CXX_ALLOCATOR_H 1 +#ifndef _GLIBCXX_CXX_ALLOCATOR_H +#define _GLIBCXX_CXX_ALLOCATOR_H 1 // Define bitmap_allocator as the base class to std::allocator. #include diff --git a/libstdc++-v3/config/allocator/malloc_allocator_base.h b/libstdc++-v3/config/allocator/malloc_allocator_base.h index f7ae65c8bd3..3ff1c208d39 100644 --- a/libstdc++-v3/config/allocator/malloc_allocator_base.h +++ b/libstdc++-v3/config/allocator/malloc_allocator_base.h @@ -32,8 +32,8 @@ * You should not attempt to use it directly. */ -#ifndef _CXX_ALLOCATOR_H -#define _CXX_ALLOCATOR_H 1 +#ifndef _GLIBCXX_CXX_ALLOCATOR_H +#define _GLIBCXX_CXX_ALLOCATOR_H 1 // Define new_allocator as the base class to std::allocator. #include diff --git a/libstdc++-v3/config/allocator/mt_allocator_base.h b/libstdc++-v3/config/allocator/mt_allocator_base.h index 8af5d4bf03a..bf1c9e5f7c0 100644 --- a/libstdc++-v3/config/allocator/mt_allocator_base.h +++ b/libstdc++-v3/config/allocator/mt_allocator_base.h @@ -32,8 +32,8 @@ * You should not attempt to use it directly. */ -#ifndef _CXX_ALLOCATOR_H -#define _CXX_ALLOCATOR_H 1 +#ifndef _GLIBCXX_CXX_ALLOCATOR_H +#define _GLIBCXX_CXX_ALLOCATOR_H 1 // Define mt_allocator as the base class to std::allocator. #include diff --git a/libstdc++-v3/config/allocator/new_allocator_base.h b/libstdc++-v3/config/allocator/new_allocator_base.h index 571fdc30942..9c8958cf18b 100644 --- a/libstdc++-v3/config/allocator/new_allocator_base.h +++ b/libstdc++-v3/config/allocator/new_allocator_base.h @@ -32,8 +32,8 @@ * You should not attempt to use it directly. */ -#ifndef _CXX_ALLOCATOR_H -#define _CXX_ALLOCATOR_H 1 +#ifndef _GLIBCXX_CXX_ALLOCATOR_H +#define _GLIBCXX_CXX_ALLOCATOR_H 1 // Define new_allocator as the base class to std::allocator. #include diff --git a/libstdc++-v3/config/allocator/pool_allocator_base.h b/libstdc++-v3/config/allocator/pool_allocator_base.h index 354bb85e3ba..5fcbed49bd4 100644 --- a/libstdc++-v3/config/allocator/pool_allocator_base.h +++ b/libstdc++-v3/config/allocator/pool_allocator_base.h @@ -32,8 +32,8 @@ * You should not attempt to use it directly. */ -#ifndef _CXX_ALLOCATOR_H -#define _CXX_ALLOCATOR_H 1 +#ifndef _GLIBCXX_CXX_ALLOCATOR_H +#define _GLIBCXX_CXX_ALLOCATOR_H 1 // Define new_allocator as the base class to std::allocator. #include diff --git a/libstdc++-v3/config/cpu/sh/atomicity.h b/libstdc++-v3/config/cpu/sh/atomicity.h index d200818f66d..f4bfb12f580 100644 --- a/libstdc++-v3/config/cpu/sh/atomicity.h +++ b/libstdc++-v3/config/cpu/sh/atomicity.h @@ -28,11 +28,11 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _BITS_ATOMICITY_H -#define _BITS_ATOMICITY_H 1 - #ifdef __SH4A__ +#ifndef _GLIBCXX_ATOMICITY_H +#define _GLIBCXX_ATOMICITY_H 1 + typedef int _Atomic_word; static inline _Atomic_word @@ -70,6 +70,8 @@ __atomic_add (volatile _Atomic_word* __mem, int __val) : "r0"); } +#endif + #else /* !__SH4A__ */ /* This is generic/atomicity.h */ @@ -103,5 +105,3 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) _GLIBCXX_END_NAMESPACE #endif /* !__SH4A__ */ - -#endif /* atomicity.h */ diff --git a/libstdc++-v3/config/io/basic_file_stdio.h b/libstdc++-v3/config/io/basic_file_stdio.h index 75468e09371..175d13afd3c 100644 --- a/libstdc++-v3/config/io/basic_file_stdio.h +++ b/libstdc++-v3/config/io/basic_file_stdio.h @@ -37,8 +37,8 @@ * You should not attempt to use it directly. */ -#ifndef _BASIC_FILE_STDIO_H -#define _BASIC_FILE_STDIO_H 1 +#ifndef _GLIBCXX_BASIC_FILE_STDIO_H +#define _GLIBCXX_BASIC_FILE_STDIO_H 1 #pragma GCC system_header diff --git a/libstdc++-v3/config/io/c_io_stdio.h b/libstdc++-v3/config/io/c_io_stdio.h index 69b82052dda..090d1f405e8 100644 --- a/libstdc++-v3/config/io/c_io_stdio.h +++ b/libstdc++-v3/config/io/c_io_stdio.h @@ -35,8 +35,8 @@ // c_io_stdio.h - Defines for using "C" stdio.h -#ifndef _C_IO_STDIO_H -#define _C_IO_STDIO_H 1 +#ifndef _GLIBCXX_CXX_IO_H +#define _GLIBCXX_CXX_IO_H 1 #include #include diff --git a/libstdc++-v3/config/locale/generic/c_locale.h b/libstdc++-v3/config/locale/generic/c_locale.h index d180c205f1f..1b7fc6ddb10 100644 --- a/libstdc++-v3/config/locale/generic/c_locale.h +++ b/libstdc++-v3/config/locale/generic/c_locale.h @@ -39,8 +39,8 @@ // Written by Benjamin Kosnik -#ifndef _C_LOCALE_H -#define _C_LOCALE_H 1 +#ifndef _GLIBCXX_CXX_LOCALE_H +#define _GLIBCXX_CXX_LOCALE_H 1 #pragma GCC system_header diff --git a/libstdc++-v3/config/locale/gnu/c_locale.h b/libstdc++-v3/config/locale/gnu/c_locale.h index f0b2b7dcaa2..bc9db3a44b2 100644 --- a/libstdc++-v3/config/locale/gnu/c_locale.h +++ b/libstdc++-v3/config/locale/gnu/c_locale.h @@ -39,8 +39,8 @@ // Written by Benjamin Kosnik -#ifndef _C_LOCALE_H -#define _C_LOCALE_H 1 +#ifndef _GLIBCXX_CXX_LOCALE_H +#define _GLIBCXX_CXX_LOCALE_H 1 #pragma GCC system_header diff --git a/libstdc++-v3/config/os/vxworks/os_defines.h b/libstdc++-v3/config/os/vxworks/os_defines.h index 89cb859288b..12ac31d1010 100644 --- a/libstdc++-v3/config/os/vxworks/os_defines.h +++ b/libstdc++-v3/config/os/vxworks/os_defines.h @@ -32,8 +32,8 @@ * You should not attempt to use it directly. */ -#ifndef _GLIBCPP_OS_DEFINES -#define _GLIBCPP_OS_DEFINES 1 +#ifndef _GLIBCXX_OS_DEFINES +#define _GLIBCXX_OS_DEFINES 1 // System-specific #define, typedefs, corrections, etc, go here. This // file will come before all others. diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index f6ecf315241..8e6084e9e10 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -1,7 +1,7 @@ // Predefined symbols and macros -*- C++ -*- -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 -// Free Software Foundation, Inc. +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, +// 2006, 2007 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 @@ -33,8 +33,8 @@ * You should not attempt to use it directly. */ -#ifndef _CXXCONFIG -#define _CXXCONFIG 1 +#ifndef _GLIBCXX_CXX_CONFIG_H +#define _GLIBCXX_CXX_CONFIG_H 1 // Pick up any OS-specific definitions. #include