This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
[v3] config includes consistency check

From: Benjamin Kosnik <bkoz at redhat dot com>
To: libstdc++ at gcc dot gnu dot org
Cc: gcc-patches at gcc dot gnu dot org
Date: Fri, 02 Feb 2007 15:56:07 +0100
Subject: [v3] config includes consistency check
Some consistency cleanups that I did while working on the includes.

tested x86/linux

-benjamin
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.

Index: include/bits/c++config
===================================================================
--- include/bits/c++config	(revision 121500)
+++ include/bits/c++config	(working copy)
@@ -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>
Index: config/locale/gnu/c_locale.h
===================================================================
--- config/locale/gnu/c_locale.h	(revision 121500)
+++ config/locale/gnu/c_locale.h	(working copy)
@@ -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
 
Index: config/locale/generic/c_locale.h
===================================================================
--- config/locale/generic/c_locale.h	(revision 121500)
+++ config/locale/generic/c_locale.h	(working copy)
@@ -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
 
Index: config/allocator/mt_allocator_base.h
===================================================================
--- config/allocator/mt_allocator_base.h	(revision 121500)
+++ config/allocator/mt_allocator_base.h	(working copy)
@@ -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>
Index: config/allocator/malloc_allocator_base.h
===================================================================
--- config/allocator/malloc_allocator_base.h	(revision 121500)
+++ config/allocator/malloc_allocator_base.h	(working copy)
@@ -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>
Index: config/allocator/new_allocator_base.h
===================================================================
--- config/allocator/new_allocator_base.h	(revision 121500)
+++ config/allocator/new_allocator_base.h	(working copy)
@@ -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>
Index: config/allocator/pool_allocator_base.h
===================================================================
--- config/allocator/pool_allocator_base.h	(revision 121500)
+++ config/allocator/pool_allocator_base.h	(working copy)
@@ -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>
Index: config/allocator/bitmap_allocator_base.h
===================================================================
--- config/allocator/bitmap_allocator_base.h	(revision 121500)
+++ config/allocator/bitmap_allocator_base.h	(working copy)
@@ -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>
Index: config/os/vxworks/os_defines.h
===================================================================
--- config/os/vxworks/os_defines.h	(revision 121500)
+++ config/os/vxworks/os_defines.h	(working copy)
@@ -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.
Index: config/cpu/sh/atomicity.h
===================================================================
--- config/cpu/sh/atomicity.h	(revision 121500)
+++ config/cpu/sh/atomicity.h	(working copy)
@@ -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 @@
       : "r0");
 }
 
+#endif
+
 #else /* !__SH4A__ */
 
 /* This is generic/atomicity.h */
@@ -103,5 +105,3 @@
 _GLIBCXX_END_NAMESPACE
 
 #endif /* !__SH4A__ */
-
-#endif /* atomicity.h */
Index: config/io/c_io_stdio.h
===================================================================
--- config/io/c_io_stdio.h	(revision 121500)
+++ config/io/c_io_stdio.h	(working copy)
@@ -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>
Index: config/io/basic_file_stdio.h
===================================================================
--- config/io/basic_file_stdio.h	(revision 121500)
+++ config/io/basic_file_stdio.h	(working copy)
@@ -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
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]