2007-04-20 Ed Schonberg <schonberg@adacore.com>

[pf3gnuchains/gcc-fork.git] / gcc / ada / ada.h

diff --git a/gcc/ada/ada.h b/gcc/ada/ada.h
index 20418b6..a55d013 100644 (file)
--- a/gcc/ada/ada.h
+++ b/gcc/ada/ada.h
@@ -6,9 +6,7 @@
  *                                                                          *
  *                              C Header File                               *
  *                                                                          *
- *                            $Revision: 1.1 $
- *                                                                          *
- *          Copyright (C) 1992-2001 Free Software Foundation, Inc.          *
+ *          Copyright (C) 1992-2003 Free Software Foundation, Inc.          *
  *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
@@ -18,8 +16,8 @@
  * 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  distributed with GNAT;  see file COPYING.  If not, write *
- * to  the Free Software Foundation,  59 Temple Place - Suite 330,  Boston, *
- * MA 02111-1307, USA.                                                      *
+ * to  the  Free Software Foundation,  51  Franklin  Street,  Fifth  Floor, *
+ * Boston, MA 02110-1301, USA.                                              *
  *                                                                          *
  * As a  special  exception,  if you  link  this file  with other  files to *
  * produce an executable,  this file does not by itself cause the resulting *
@@ -28,13 +26,16 @@
  * file might be covered by the  GNU Public License.                        *
  *                                                                          *
  * GNAT was originally developed  by the GNAT team at  New York University. *
- * It is now maintained by Ada Core Technologies Inc (http://www.gnat.com). *
+ * Extensive contributions were provided by Ada Core Technologies Inc.      *
  *                                                                          *
  ****************************************************************************/
 
 /* This file contains some standard macros for performing Ada-like
    operations. These are used to aid in the translation of other headers. */
 
+#ifndef GCC_ADA_H
+#define GCC_ADA_H
+
 /* Inlined functions in header are preceded by INLINE, which is normally set
    to extern inline for GCC, but may be set to static for use in standard 
    ANSI-C.  */
@@ -63,14 +64,17 @@
    effect is to compile a typedef defining the subtype as a synonym for the 
    type, together with two constants defining the end points.  */
 
-#define SUBTYPE(SUBTYPE,TYPE,FIRST,LAST)    \
-  typedef TYPE SUBTYPE;                    \
-  static const SUBTYPE CAT (SUBTYPE,__First) = FIRST; \
-  static const SUBTYPE CAT (SUBTYPE,__Last) = LAST;
+#define SUBTYPE(SUBTYPE,TYPE,FIRST,LAST)       \
+  typedef TYPE SUBTYPE;                                \
+  enum { CAT (SUBTYPE,__First) = FIRST,                \
+         CAT (SUBTYPE,__Last) = LAST };
 
 /* The following definitions provide the equivalent of the Ada IN and NOT IN
    operators, assuming that the subtype involved has been defined using the 
    SUBTYPE macro defined above.  */
 
 #define IN(VALUE,SUBTYPE) \
-  (((VALUE) >= CAT (SUBTYPE,__First)) && ((VALUE) <= CAT (SUBTYPE,__Last)))
+  (((VALUE) >= (SUBTYPE) CAT (SUBTYPE,__First)) \
+   && ((VALUE) <= (SUBTYPE) CAT (SUBTYPE,__Last)))
+
+#endif