Merge mainline to intercu branch - 2004-09-15

1 files changed, 20 insertions, 4 deletions

diff --git a/gdb/testsuite/gdb.base/whatis.c b/gdb/testsuite/gdb.base/whatis.c
index 63d5d3dae09..7d4a647781f 100644
--- a/gdb/testsuite/gdb.base/whatis.c
+++ b/gdb/testsuite/gdb.base/whatis.c
@@ -1,3 +1,23 @@
+/* This test program is part of GDB, the GNU debugger.
+
+   Copyright 1992, 1993, 1994, 1997, 1999, 2004
+   Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY 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
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   */
+
 /*
  *	Test file with lots of different types, for testing the
  *	"whatis" command.
@@ -7,10 +27,6 @@
  *	First the basic C types.
  */
 
-#if !(defined (__STDC__) || defined (_AIX))
-#define signed  /**/
-#endif
-
 char		v_char;
 signed char	v_signed_char;
 unsigned char	v_unsigned_char;