minor fixincludes patches

Robert Lipe robertlipe@usa.net
Thu Mar 11 21:42:00 GMT 1999


Perhaps Bruce meant to exercise the "fall back on the script when
the binary won't build" code in the new fixincludes.  (It works. :-)
After we got fixinc building in the right place we were picking up 
gcc/config.h which is well, wierd enough that we don't want it.   We
do much better looking inside auto-host...


* Makefile.in (OBJ): Add procopen.
* fixincl.c: Include auto-host.h instead of config.h
* procopen.c: Likewise.
* regex.c: Likewise.
* server.c: Likewise.



Index: Makefile.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/fixinc/Makefile.in,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.in
--- Makefile.in	1999/03/03 07:41:17	1.3
+++ Makefile.in	1999/03/12 05:37:39
@@ -58,7 +58,7 @@ INCLUDES = -I. -I.. -I$(srcdir) -I$(srcd
 ##
 ## # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-OBJ = fixincl.o server.o regex.o
+OBJ = fixincl.o server.o regex.o procopen.o
 HDR = server.h regex.h
 LIBERTY = ../../libiberty/libiberty.a
 
Index: fixincl.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/fixinc/fixincl.c,v
retrieving revision 1.3
diff -u -p -r1.3 fixincl.c
--- fixincl.c	1999/03/03 07:41:39	1.3
+++ fixincl.c	1999/03/12 05:37:41
@@ -30,7 +30,7 @@ Boston, MA 02111-1307, USA.  */
 # include "The fixincl program does not work properly on this system!"
 #endif
 
-#include "config.h"
+#include "auto-host.h"
 
 #include <sys/types.h>
 #include <sys/param.h>
Index: procopen.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/fixinc/procopen.c,v
retrieving revision 1.2
diff -u -p -r1.2 procopen.c
--- procopen.c	1999/03/03 07:41:15	1.2
+++ procopen.c	1999/03/12 05:37:41
@@ -45,7 +45,7 @@
  * choice whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.
  */
-#include "config.h"
+#include "auto-host.h"
 
 #include <sys/types.h>
 #ifdef HAVE_FCNTL_H
Index: regex.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/fixinc/regex.c,v
retrieving revision 1.4
diff -u -p -r1.4 regex.c
--- regex.c	1999/03/03 07:41:48	1.4
+++ regex.c	1999/03/12 05:37:47
@@ -46,7 +46,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "auto-host.h"
 #endif
 
 /* The `emacs' switch turns on certain matching commands
Index: server.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/fixinc/server.c,v
retrieving revision 1.3
diff -u -p -r1.3 server.c
--- server.c	1999/03/03 07:41:51	1.3
+++ server.c	1999/03/12 05:37:47
@@ -45,7 +45,7 @@
  * choice whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.
  */
-#include "config.h"
+#include "auto-host.h"
 
 #include <sys/types.h>
 #ifdef HAVE_FCNTL_H


More information about the Gcc-patches mailing list