* ifcvt.c (cond_exec_find_if_block): Return FALSE if no

[pf3gnuchains/gcc-fork.git] / libcpp / system.h

diff --git a/libcpp/system.h b/libcpp/system.h
index 98ac118..e08bdf1 100644 (file)
--- a/libcpp/system.h
+++ b/libcpp/system.h
@@ -17,8 +17,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free

-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */

 
 
 #ifndef LIBCPP_SYSTEM_H
 
 
 #ifndef LIBCPP_SYSTEM_H


@@ -342,10 +342,14 @@ extern void abort (void);
 #include "libiberty.h"
 #include "safe-ctype.h"
 
 #include "libiberty.h"
 #include "safe-ctype.h"
 

-/* 1 if we have C99 designated initializers.  */
+/* 1 if we have C99 designated initializers.
+
+   ??? C99 designated initializers are not supported by most C++
+   compilers, including G++.  -- gdr, 2005-05-18  */

 #if !defined(HAVE_DESIGNATED_INITIALIZERS)
 #define HAVE_DESIGNATED_INITIALIZERS \
 #if !defined(HAVE_DESIGNATED_INITIALIZERS)
 #define HAVE_DESIGNATED_INITIALIZERS \

-  ((GCC_VERSION >= 2007) || (__STDC_VERSION__ >= 199901L))
+  ((!defined(__cplusplus) && (GCC_VERSION >= 2007)) \
+   || (__STDC_VERSION__ >= 199901L))

 #endif
 
 /* Be conservative and only use enum bitfields with GCC.
 #endif
 
 /* Be conservative and only use enum bitfields with GCC.


@@ -379,7 +383,9 @@ extern void abort (void);
 #undef TRUE
 #undef FALSE
 
 #undef TRUE
 #undef FALSE
 

+#ifndef __cplusplus

 #define bool unsigned char
 #define bool unsigned char

+#endif

 #define true 1
 #define false 0
 
 #define true 1
 #define false 0