2002-02-13 Michael Chastain <mec@shout.net>

	* defs.h: Kill CONST_PTR.
	* c-lang.h (c_builtin_types): Change CONST_PTR to simple "const".
	* c-lang.c (c_builtin_types): Likewise.
	* ch-lang.c (ch_builtin_types): Likewise.
	* f-lang.c (f_builtin_types): Likewise.
	* language.c (unknown_builtin_types): Likewise.
	* m2-lang.c (m2_builtin_types): Likewise.
	* p-lang.c (pascal_builtin_types): Likewise.
	* scm-lang.c (c_builtin_types): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 80aad0d2d7d0ae6bf3149fd0ef4ac751fbf20cd9..6d826dbd2f3fb6b3112656f52c4243db4a106aa6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,15 @@
+2002-02-13  Michael Chastain <mec@shout.net>
+
+       * defs.h: Kill CONST_PTR.
+       * c-lang.h (c_builtin_types): Change CONST_PTR to simple "const".
+       * c-lang.c (c_builtin_types): Likewise.
+       * ch-lang.c (ch_builtin_types): Likewise.
+       * f-lang.c (f_builtin_types): Likewise.
+       * language.c (unknown_builtin_types): Likewise.
+       * m2-lang.c (m2_builtin_types): Likewise.
+       * p-lang.c (pascal_builtin_types): Likewise.
+       * scm-lang.c (c_builtin_types): Likewise.
+
 2002-02-13  Keith Seitz  <keiths@redhat.com>
 
        * arm-tdep.h (arm_get_next_pc): Add declaration.

diff --git a/gdb/c-lang.c b/gdb/c-lang.c
index 9e92d7e90915ea6199191d83a7fd5e9bda8d83d9..fa977cdd8598e1ba6ba020a36347d4a78ba4c3c6 100644 (file)
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -1,5 +1,5 @@
 /* C language support routines for GDB, the GNU debugger.
-   Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000
+   Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2002
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -385,7 +385,7 @@ const struct op_print c_op_print_tab[] =
   {NULL, 0, 0, 0}
 };
 \f
-struct type **CONST_PTR (c_builtin_types[]) =
+struct type **const (c_builtin_types[]) =
 {
   &builtin_type_int,
   &builtin_type_long,

diff --git a/gdb/c-lang.h b/gdb/c-lang.h
index 8d5c002f9053a35c6c388ca5ac394ee4772dddc2..b1925e1e2d6682810a11beebfa9ebebcf4d020ec 100644 (file)
--- a/gdb/c-lang.h
+++ b/gdb/c-lang.h
@@ -1,5 +1,5 @@
 /* C language support definitions for GDB, the GNU debugger.
-   Copyright 1992, 1994, 1995, 1996, 1997, 1998, 2000
+   Copyright 1992, 1994, 1995, 1996, 1997, 1998, 2000, 2002
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -51,7 +51,7 @@ extern void c_printstr (struct ui_file * stream, char *string,
 
 extern struct type *c_create_fundamental_type (struct objfile *, int);
 
-extern struct type **CONST_PTR (c_builtin_types[]);
+extern struct type **const (c_builtin_types[]);
 
 /* These are in c-typeprint.c: */
 

diff --git a/gdb/ch-lang.c b/gdb/ch-lang.c
index f65e635a5d03e8cb8662fd68cfbd6201ab734d58..b46dce014542e07047e865119e860d8f50bde8d9 100644 (file)
--- a/gdb/ch-lang.c
+++ b/gdb/ch-lang.c
@@ -1,5 +1,5 @@
 /* Chill language support routines for GDB, the GNU debugger.
-   Copyright 1992, 1993, 1994, 1995, 1996, 2000, 2001
+   Copyright 1992, 1993, 1994, 1995, 1996, 2000, 2001, 2002
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -322,7 +322,7 @@ struct type *builtin_type_chill_long;
 struct type *builtin_type_chill_ulong;
 struct type *builtin_type_chill_real;
 
-struct type **CONST_PTR (chill_builtin_types[]) =
+struct type **const (chill_builtin_types[]) =
 {
   &builtin_type_chill_bool,
     &builtin_type_chill_char,

diff --git a/gdb/defs.h b/gdb/defs.h
index 5962b1456d550de1c25480d6d0641d48665b664e..cf7b0cec4e1f735b79fe6056eff80398c00cc8b7 100644 (file)
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -987,8 +987,6 @@ typedef struct ptid ptid_t;
 #include "fopen-same.h"
 #endif
 
-#define CONST_PTR const
-
 /* Defaults for system-wide constants (if not defined by xm.h, we fake it).
    FIXME: Assumes 2's complement arithmetic */
 

diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index bee4063c9d0e466f4022447a524946e0a1f1e3ac..1727bda8d2bb5f9aa791963b8a7397d33a808900 100644 (file)
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -1,5 +1,5 @@
 /* Fortran language support routines for GDB, the GNU debugger.
-   Copyright 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+   Copyright 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Contributed by Motorola.  Adapted from the C parser by Farooq Butt
    (fmbutt@engage.sps.mot.com).
@@ -429,7 +429,7 @@ static const struct op_print f_op_print_tab[] =
   {NULL, 0, 0, 0}
 };
 \f
-struct type **CONST_PTR (f_builtin_types[]) =
+struct type **const (f_builtin_types[]) =
 {
   &builtin_type_f_character,
     &builtin_type_f_logical,

diff --git a/gdb/language.c b/gdb/language.c
index a9077a9695eec853e378716df2408b3027f1060e..4c4036b68f7f7753ddf8d87b93561f535d4a0ad3 100644 (file)
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -1,5 +1,5 @@
 /* Multiple source language support for GDB.
-   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Contributed by the Department of Computer Science at the State University
    of New York at Buffalo.
@@ -1444,7 +1444,7 @@ unk_lang_value_print (struct value *val, struct ui_file *stream, int format,
   error ("internal error - unimplemented function unk_lang_value_print called.");
 }
 
-static struct type **CONST_PTR (unknown_builtin_types[]) =
+static struct type **const (unknown_builtin_types[]) =
 {
   0
 };

diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c
index 15e36004b3b161541db69d116793a71a55c255dd..116d85009fd0abfea4a8f884799d981a4d903140 100644 (file)
--- a/gdb/m2-lang.c
+++ b/gdb/m2-lang.c
@@ -1,5 +1,5 @@
 /* Modula 2 language support routines for GDB, the GNU debugger.
-   Copyright 1992, 1993, 1994, 1995, 1996, 1998, 2000
+   Copyright 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2002
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -398,7 +398,7 @@ struct type *builtin_type_m2_card;
 struct type *builtin_type_m2_real;
 struct type *builtin_type_m2_bool;
 
-struct type **CONST_PTR (m2_builtin_types[]) =
+struct type **const (m2_builtin_types[]) =
 {
   &builtin_type_m2_char,
     &builtin_type_m2_int,

diff --git a/gdb/p-lang.c b/gdb/p-lang.c
index b5ad5801aaba745acd0913fa02658623f94157ce..62c8a641a7c82b5f8e333dfbd0a698f858209217 100644 (file)
--- a/gdb/p-lang.c
+++ b/gdb/p-lang.c
@@ -1,5 +1,5 @@
 /* Pascal language support routines for GDB, the GNU debugger.
-   Copyright 2000 Free Software Foundation, Inc.
+   Copyright 2000, 2002 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -407,7 +407,7 @@ const struct op_print pascal_op_print_tab[] =
   {NULL, 0, 0, 0}
 };
 \f
-struct type **const /* CONST_PTR v 4.17 */ (pascal_builtin_types[]) =
+struct type **const (pascal_builtin_types[]) =
 {
   &builtin_type_int,
     &builtin_type_long,

diff --git a/gdb/scm-lang.c b/gdb/scm-lang.c
index 4f1295c2df3854a9dacd9bc49400f93fd2aa19a7..30ca763c1da487d9bfd1cb60cb2f49acb0c0be2a 100644 (file)
--- a/gdb/scm-lang.c
+++ b/gdb/scm-lang.c
@@ -41,7 +41,7 @@ static void scm_printstr (struct ui_file * stream, char *string,
                          unsigned int length, int width,
                          int force_ellipses);
 
-extern struct type **CONST_PTR (c_builtin_types[]);
+extern struct type **const (c_builtin_types[]);
 
 struct type *builtin_type_scm;