Re: 6.1: Use cconfig.h instead of config.h in sim/common [resend]

[Daniel Jacobowitz <drow@false.org>]

On Tue, Apr 20, 2004 at 05:00:21PM +0200, Maciej W. Rozycki wrote:
> Hello,
> 
>  Despite:
> 
> http://sources.redhat.com/ml/gdb-patches/2003-12/msg00057.html
> 
> the following patch hasn't been applied.  What's wrong with it?
> 
> 2004-04-20  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
> 
> 	* callback.c: Include cconfig.h instead of config.h.
> 	* run.c: Likewise.
> 	* sim-basics.h: Likewise.
> 	* sim-load.c: Likewise.
> 	* syscall.c: Likewise.

Nothing, it just got forgotten.  I've checked in this.

-- 
Daniel Jacobowitz

2004-05-10  Daniel Jacobowitz  <dan@debian.org>

	* callback.c: Update copyright dates.
	* run.c: Likewise.
	* sim-basics.h: Likewise.
	* sim-load.c: Likewise.
	* syscall.c: Likewise.

2004-05-10  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>

	* callback.c: Include cconfig.h instead of config.h.
	* run.c: Likewise.
	* sim-basics.h: Likewise.
	* sim-load.c: Likewise.
	* syscall.c: Likewise.

Index: sim/common/callback.c
===================================================================
RCS file: /cvs/src/src/sim/common/callback.c,v
retrieving revision 1.7
diff -u -p -r1.7 callback.c
--- sim/common/callback.c	21 Oct 2003 20:41:43 -0000	1.7
+++ sim/common/callback.c	10 May 2004 16:13:59 -0000
@@ -1,5 +1,6 @@
 /* Remote target callback routines.
-   Copyright 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright 1995, 1996, 1997, 2000, 2002, 2003, 2004
+   Free Software Foundation, Inc.
    Contributed by Cygnus Solutions.
 
    This file is part of GDB.
@@ -22,7 +23,7 @@
    level.  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cconfig.h"
 #endif
 #include "ansidecl.h"
 #ifdef ANSI_PROTOTYPES
Index: sim/common/run.c
===================================================================
RCS file: /cvs/src/src/sim/common/run.c,v
retrieving revision 1.14
diff -u -p -r1.14 run.c
--- sim/common/run.c	5 Jun 2003 02:17:29 -0000	1.14
+++ sim/common/run.c	10 May 2004 16:13:59 -0000
@@ -1,5 +1,6 @@
 /* run front end support for all the simulators.
-   Copyright (C) 1992, 93-96, 1997, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+   2001, 2002, 2003, 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
@@ -18,8 +19,10 @@ with this program; if not, write to the 
 /* Steve Chamberlain sac@cygnus.com,
    and others at Cygnus.  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include "cconfig.h"
 #include "tconfig.h"
+#endif
 
 #include <signal.h>
 #include <stdio.h>
Index: sim/common/sim-basics.h
===================================================================
RCS file: /cvs/src/src/sim/common/sim-basics.h,v
retrieving revision 1.3
diff -u -p -r1.3 sim-basics.h
--- sim/common/sim-basics.h	23 Nov 2002 01:12:05 -0000	1.3
+++ sim/common/sim-basics.h	10 May 2004 16:13:59 -0000
@@ -1,6 +1,6 @@
 /* The common simulator framework for GDB, the GNU Debugger.
 
-   Copyright 2002 Free Software Foundation, Inc.
+   Copyright 2002, 2004 Free Software Foundation, Inc.
 
    Contributed by Andrew Cagney and Red Hat.
 
@@ -29,7 +29,7 @@
 /* Basic configuration */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cconfig.h"
 #endif
 
 /* Basic host dependant mess - hopefully <stdio.h> + <stdarg.h> will
Index: sim/common/sim-load.c
===================================================================
RCS file: /cvs/src/src/sim/common/sim-load.c,v
retrieving revision 1.5
diff -u -p -r1.5 sim-load.c
--- sim/common/sim-load.c	9 Jun 2002 15:45:45 -0000	1.5
+++ sim/common/sim-load.c	10 May 2004 16:13:59 -0000
@@ -1,5 +1,5 @@
 /* Utility to load a file into the simulator.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2001, 2002, 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
@@ -19,7 +19,9 @@ along with this program; if not, write t
    as it is used by simulators that don't use it [though that doesn't mean
    to suggest that they shouldn't :-)].  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include "cconfig.h"
+#endif
 #include "ansidecl.h"
 #include <stdio.h> /* for NULL */
 #ifdef ANSI_PROTOTYPES
Index: sim/common/syscall.c
===================================================================
RCS file: /cvs/src/src/sim/common/syscall.c,v
retrieving revision 1.2
diff -u -p -r1.2 syscall.c
--- sim/common/syscall.c	9 Jun 2002 15:45:45 -0000	1.2
+++ sim/common/syscall.c	10 May 2004 16:13:59 -0000
@@ -1,5 +1,5 @@
 /* Remote target system call support.
-   Copyright 1997, 1998 Free Software Foundation, Inc.
+   Copyright 1997, 1998, 2002, 2004 Free Software Foundation, Inc.
    Contributed by Cygnus Solutions.
 
    This file is part of GDB.
@@ -25,7 +25,7 @@
    supported.  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cconfig.h"
 #endif
 #include "ansidecl.h"
 #include "libiberty.h"