From: Nathan Bryant <loanshark@uncensored.citadel.org>
Date: Sat, 5 Dec 1998 20:59:40 +0000 (+0000)
Subject: portability enhancements
X-Git-Tag: v7.86~8058
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=d36ea92f8c171eed138d449f8ac3684f5a4c215f

portability enhancements
---

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index ee8fa93ec..42e90d558 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -2,6 +2,7 @@
 	* tcp_sockets.c: removed some dead code
 	* context_loop.c: oops, I made a memory leak. fix fix fix. also close
 	  unused ends of pipes, fix a file descriptor leak and a race condition
+	* portability enhancements
 
 1998-12-04 Nathan Bryant <bryant@cs.usm.maine.edu>
 	* webserver.c, context_loop.c, webcit.c: add commandline args for host
diff --git a/webcit/auth.c b/webcit/auth.c
index ebf39b55c..0b9dbc5bd 100644
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -7,7 +7,9 @@
  */
 
 #include <stdlib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/webcit/configure.in b/webcit/configure.in
index 1ce230cd0..3b199101d 100644
--- a/webcit/configure.in
+++ b/webcit/configure.in
@@ -25,7 +25,7 @@ fi
 dnl Checks for header files.
 AC_HEADER_STDC
 dnl AC_HEADER_SYS_WAIT
-dnl AC_CHECK_HEADERS(fcntl.h limits.h sys/time.h unistd.h)
+AC_CHECK_HEADERS(fcntl.h limits.h sys/time.h unistd.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -34,7 +34,7 @@ AC_TYPE_SIZE_T
 dnl AC_HEADER_TIME
 
 dnl Checks for library functions.
-dnl AC_TYPE_SIGNAL
+AC_TYPE_SIGNAL
 dnl AC_FUNC_VPRINTF
 dnl AC_CHECK_FUNCS(strerror)
 AC_REPLACE_FUNCS(snprintf)
diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index 97eeff6eb..722775fb3 100644
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -11,15 +11,23 @@
 
 #include <ctype.h>
 #include <stdlib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdio.h>
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 #include <netinet/in.h>
 #include <netdb.h>
 #include <string.h>
diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index e8628ff3c..e612d42e6 100644
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -1,7 +1,9 @@
 /* $Id$ */
 
 #include <stdlib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/webcit/roomops.c b/webcit/roomops.c
index 1ee6258e8..449e9c6b0 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -2,7 +2,9 @@
 
 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdio.h>
 #include <signal.h>
 #include <sys/types.h>
diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index fa7424f91..9c894e03b 100644
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -3,7 +3,9 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdio.h>
 #include "webcit.h"
 #include "child.h"
diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index c6c58f236..34781617d 100644
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -7,7 +7,9 @@
  */
 
 #include <stdlib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdio.h>
 #include <signal.h>
 #include <sys/types.h>
@@ -30,7 +32,7 @@ extern int errno;
 int serv_sock;
 
 
-void timeout(int signum) {
+RETSIGTYPE timeout(int signum) {
 	printf("\rConnection timed out.\n");
 	exit(3);
 	}
diff --git a/webcit/webcit.c b/webcit/webcit.c
index bedccdef5..1e80118fa 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -9,7 +9,9 @@
  */
 
 #include <stdlib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/webcit/webserver.c b/webcit/webserver.c
index 834e11a1a..a4a68e5d4 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -10,15 +10,23 @@
 
 #include <ctype.h>
 #include <stdlib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdio.h>
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 #include <netinet/in.h>
 #include <netdb.h>
 #include <string.h>
diff --git a/webcit/who.c b/webcit/who.c
index 5f8937b7a..c3207f3bd 100644
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -1,7 +1,9 @@
 /* $Id$ */
 
 #include <stdlib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdio.h>
 #include <signal.h>
 #include <sys/types.h>