CVS update: Vanilla

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

Date:	Friday March 12, 1999 @ 19:08
Author:	tanner

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

Modified Files:
	config.h.in configure configure.in 
Log Message:
Changes to get the server to -compile- on Solaris 2.5.1. 

There are lots of program files that #include #defined macro. I started 
to move all this stuff into config.h, where I think it should be located.



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

Index: Vanilla/config.h.in
diff -u Vanilla/config.h.in:1.6 Vanilla/config.h.in:1.7
--- Vanilla/config.h.in:1.6	Fri Mar 12 11:40:24 1999
+++ Vanilla/config.h.in	Fri Mar 12 19:08:37 1999
@@ -1,6 +1,12 @@
 /*      Netrek Configuration file       -              by Kurt Siegl
  *
  * $Log: config.h.in,v $
+ * Revision 1.7  1999/03/13 01:08:37  tanner
+ * Changes to get the server to -compile- on Solaris 2.5.1.
+ *
+ * There are lots of program files that #include #defined macro. I started
+ * to move all this stuff into config.h, where I think it should be located.
+ *
  * Revision 1.6  1999/03/12 17:40:24  siegl
  * COW autoconfig code with GMP 2 support
  *
@@ -436,6 +442,7 @@
 #undef HAVE_SYS_RESOURCE_H
 #undef HAVE_SYS_WAIT_H
 #undef HAVE_NETINET_IN_H
+#undef HAVE_SYS_FILIO_H		/* Needed for Solaris 2.5.1 */
 #undef HAVE_GMP2_H
 #undef NO_U_INT 
 #undef SIZEOF_LONG
@@ -511,8 +518,10 @@
 
 #ifdef STDC_HEADERS
 #define INC_STRINGS	<string.h>
+#include <string.h>
 #else
 #define INC_STRINGS	<strings.h>
+#include <strings.h>
 #endif
 
 #ifdef STDC_HEADERS
@@ -674,12 +683,14 @@
 
 #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
@@ -698,6 +709,7 @@
 /* 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
@@ -741,9 +753,11 @@
 /* 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
@@ -856,6 +870,12 @@
 int _flsbuf(unsigned char, FILE *);
 
 #endif /* defined sun4 */
+
+	/* Solaris 2.5.1 */
+
+#if defined(HAVE_SYS_FILIO_H)
+#include <sys/filio.h>
+#endif
 
 #ifdef WIN32
 typedef unsigned short int ushort;
Index: Vanilla/configure
diff -u Vanilla/configure:1.8 Vanilla/configure:1.9
--- Vanilla/configure:1.8	Fri Mar 12 11:40:25 1999
+++ Vanilla/configure	Fri Mar 12 19:08:37 1999
@@ -1272,7 +1272,7 @@
 fi
 done
 
-for ac_hdr in sys/wait.h netinet/in.h
+for ac_hdr in sys/wait.h netinet/in.h sys/filio.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
Index: Vanilla/configure.in
diff -u Vanilla/configure.in:1.8 Vanilla/configure.in:1.9
--- Vanilla/configure.in:1.8	Fri Mar 12 11:40:26 1999
+++ Vanilla/configure.in	Fri Mar 12 19:08:38 1999
@@ -94,7 +94,7 @@
 AC_CHECK_HEADERS(unistd.h memory.h)
 AC_CHECK_HEADERS(sys/timeb.h sys/ptyio.h sys/fcntl.h fcntl.h)
 AC_CHECK_HEADERS(ctype.h machine/endian.h sys/resource.h)
-AC_CHECK_HEADERS(sys/wait.h netinet/in.h)
+AC_CHECK_HEADERS(sys/wait.h netinet/in.h sys/filio.h)
 
 AC_FUNC_WAIT3
 AC_TYPE_PID_T