Rework last change so it's done like collect2.c.

From-SVN: r8090

diff --git a/gcc/gcc.c b/gcc/gcc.c
index a1b5bb87bdc35a21746f7ba5217e150bcce1f56e..2a9f14554c6da563d5106619f5707dd558f72c34 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -35,7 +35,7 @@ compilation is specified by a string called a "spec".  */
 #include <signal.h>
 #include <sys/stat.h>
 #include <sys/file.h>   /* May get R_OK, etc. on some systems.  */
-#include <sys/errno.h>
+#include <errno.h>
 
 #include "config.h"
 #include "obstack.h"
@@ -132,7 +132,11 @@ compilation is specified by a string called a "spec".  */
 extern void free ();
 extern char *getenv ();
 
-extern int errno, sys_nerr;
+#ifndef errno
+extern int errno;
+#endif
+
+extern int sys_nerr;
 #if defined(bsd4_4) || defined(__NetBSD__)
 extern const char *const sys_errlist[];
 #else