diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bf45d8ebff18a67cfee5294446d3d6bf1157b8a6..4af578769cb9e11dfcabf27940e12c5e27c85328 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,18 @@
+2007-02-02 Benjamin Kosnik <bkoz@redhat.com>
+
+ * 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 <pcarlini@suse.de>
PR libstdc++/14493
diff --git a/libstdc++-v3/config/allocator/bitmap_allocator_base.h b/libstdc++-v3/config/allocator/bitmap_allocator_base.h
index 36727a9582a46c84363e6ac3bbe9fbb303c721b9..d33025e1dc80a4430e4017701643c8c29746b661 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 <ext/bitmap_allocator.h>
diff --git a/libstdc++-v3/config/allocator/malloc_allocator_base.h b/libstdc++-v3/config/allocator/malloc_allocator_base.h
index f7ae65c8bd364070b8c6f72a5214629eb7461898..3ff1c208d39348ef367baed09dadc7cd7701497f 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 <ext/malloc_allocator.h>
diff --git a/libstdc++-v3/config/allocator/mt_allocator_base.h b/libstdc++-v3/config/allocator/mt_allocator_base.h
index 8af5d4bf03a07a716d6e10dadfc9bbdaf08dfe05..bf1c9e5f7c04d4bdef3ae5305ce6c3235f000a22 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 <ext/mt_allocator.h>
diff --git a/libstdc++-v3/config/allocator/new_allocator_base.h b/libstdc++-v3/config/allocator/new_allocator_base.h
index 571fdc309422b8108fd749042d65244aa5baaef9..9c8958cf18b364ea185c9fe915822f4e7838e535 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 <ext/new_allocator.h>
diff --git a/libstdc++-v3/config/allocator/pool_allocator_base.h b/libstdc++-v3/config/allocator/pool_allocator_base.h
index 354bb85e3ba6dabbb72a8ea8bedcfbb70983bbb6..5fcbed49bd437febe8497780a4657e8b223b1aca 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 <ext/pool_allocator.h>
diff --git a/libstdc++-v3/config/cpu/sh/atomicity.h b/libstdc++-v3/config/cpu/sh/atomicity.h
index d200818f66d3732e82faaced922a97748e92b933..f4bfb12f5802f5cacf7b704fe385203deab595d7 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 75468e0937153eeaa63268b0596143c8b1b19fe6..175d13afd3cbbcdbe434b3e2f5366e25ed8fd1f8 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 69b82052ddad3568f22f19a344e7b58d0f14c461..090d1f405e860b75c85a490f685af7a789a24f94 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 <cstdio>
#include <cstddef>
diff --git a/libstdc++-v3/config/locale/generic/c_locale.h b/libstdc++-v3/config/locale/generic/c_locale.h
index d180c205f1f5cf3d5f73043dc7a44c91788af398..1b7fc6ddb10140b87b5108acb499879850fc2cb0 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 <bkoz@redhat.com>
-#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 f0b2b7dcaa2fac6ab82cb89d4b46a6217ff604f2..bc9db3a44b295410317090d98e3499f58b9e0055 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 <bkoz@redhat.com>
-#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 89cb859288b9f2d0d828f287d7c5a378cd2c78b6..12ac31d10100bfa9c608c5a184c03d1c5ab1cf93 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 f6ecf315241012fe31c5ee1ab207e51f5f50e3e6..8e6084e9e1004ab4c8c2e545637d876c51714fb6 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 <bits/os_defines.h>