CVS update: Vanilla

[Vanilla CVS Development <tanner@real-time.com>]

Date:	Sunday March 14, 1999 @ 19:38
Author:	tanner

Update of /home/netrek/cvsroot/Vanilla
In directory cvs.castle.real-time.com:/var/tmp/cvs-serv580

Modified Files:
	config.h.in 
Log Message:
Reversed all previous changes to the Makefiles regarding the includes of
specific files.

Changed all includes into Kurt's #define, #include method.



****************************************

Index: Vanilla/config.h.in
diff -u Vanilla/config.h.in:1.8 Vanilla/config.h.in:1.9
--- Vanilla/config.h.in:1.8	Sun Mar 14 01:39:16 1999
+++ Vanilla/config.h.in	Sun Mar 14 19:38:04 1999
@@ -1,6 +1,12 @@
 /*      Netrek Configuration file       -              by Kurt Siegl
  *
  * $Log: config.h.in,v $
+ * Revision 1.9  1999/03/15 01:38:04  tanner
+ * Reversed all previous changes to the Makefiles regarding the includes of
+ * specific files.
+ *
+ * Changed all includes into Kurt's #define, #include method.
+ *
  * Revision 1.8  1999/03/14 07:39:16  tanner
  * Changed the Solaris specific stuff so that the includes are in the .c files
  * instead of config.h
@@ -522,10 +528,8 @@
 
 #ifdef STDC_HEADERS
 #define INC_STRINGS	<string.h>
-#include <string.h>
 #else
 #define INC_STRINGS	<strings.h>
-#include <strings.h>
 #endif
 
 #ifdef STDC_HEADERS
@@ -687,14 +691,12 @@
 
 #ifdef HAVE_UNISTD_H
 #define INC_UNISTD      <unistd.h>
-#include <unistd.h>
 #else
 #define INC_UNISTD      NULLFILE
 #endif
 
 #ifdef HAVE_SYS_FCNTL_H
 #define INC_SYS_FCNTL   <sys/fcntl.h>
-#include <sys/fcntl.h>
 #else
 #define INC_SYS_FCNTL   NULLFILE
 #endif
@@ -713,7 +715,6 @@
 /* Some systems don't include <sys/time.h> in <time.h>  */
 #if defined(TM_IN_SYS_TIME) || defined(NEED_SYS_TIME_H)
 #define INC_SYS_TIME 	<sys/time.h>
-#include <sys/time.h>
 #else
 #define INC_SYS_TIME 	NULLFILE
 #endif
@@ -757,11 +758,9 @@
 /* Replace outdated ftime with gettimeofday */
 #if defined(HAVE_SYS_TIMEB_H) && defined(HAVE_FTIME)
 #define INC_SYS_TIMEB   <sys/timeb.h>
-#include <sys/timeb.h>
 #else
 #define NOTIMEB
 #define INC_SYS_TIMEB   <sys/time.h>
-#include <sys/time.h>
 #endif
 
 #ifdef HAVE_GMP2_H
@@ -894,8 +893,13 @@
 #else
 #define INC_IO       NULLFILE
 #endif
-
-#endif  /* __CONFIG_H */
 
+	/* Solaris specific stuff */
 
+#if defined(HAVE_SYS_FILIO_H)
+#define INC_SYS_FILIO    <sys/filio.h>
+#else
+#define INC_SYS_FILIO    NULLFILE
+#endif
 
+#endif  /* __CONFIG_H */