Revision: 14492
Author: adrian.chadd
Date: Wed Mar 24 20:34:17 2010
Log: Issue #94 fixes - wrap includes of various things with autoconf/automake stuff;
migrate sys/errno.h to errno.h .


http://code.google.com/p/lusca-cache/source/detail?r=14492

Modified:
 /branches/LUSCA_HEAD/app/coss_rebuild/coss_build_dir.c
 /branches/LUSCA_HEAD/app/tcptest/tcptest.c
 /branches/LUSCA_HEAD/app/tcptest/tunnel.c
 /branches/LUSCA_HEAD/libhelper/ipc.c
 /branches/LUSCA_HEAD/libiapp/comm.c
 /branches/LUSCA_HEAD/libiapp/comm_ips_null.c
 /branches/LUSCA_HEAD/libiapp/disk.c
 /branches/LUSCA_HEAD/libiapp/fd.c
 /branches/LUSCA_HEAD/libsqdns/dns_internal.c
 /branches/LUSCA_HEAD/libsqinet/inet_legacy.c
 /branches/LUSCA_HEAD/libsqname/fqdncache.c
 /branches/LUSCA_HEAD/libsqname/ipcache.c
 /branches/LUSCA_HEAD/libsqstore/store_file_ufs.c
 /branches/LUSCA_HEAD/src/wccp2.c

=======================================
--- /branches/LUSCA_HEAD/app/coss_rebuild/coss_build_dir.c Sat Mar 20 03:05:52 2010 +++ /branches/LUSCA_HEAD/app/coss_rebuild/coss_build_dir.c Wed Mar 24 20:34:17 2010
@@ -3,7 +3,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/errno.h>
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 #include <fcntl.h>

 #include "include/squid_md5.h"
=======================================
--- /branches/LUSCA_HEAD/app/tcptest/tcptest.c  Tue Jan  6 13:40:17 2009
+++ /branches/LUSCA_HEAD/app/tcptest/tcptest.c  Wed Mar 24 20:34:17 2010
@@ -7,10 +7,18 @@
 #include <math.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <sys/errno.h>
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#if HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
+#if HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#endif

 #include "include/Array.h"
 #include "include/Stack.h"
=======================================
--- /branches/LUSCA_HEAD/app/tcptest/tunnel.c   Tue Jan  6 13:40:17 2009
+++ /branches/LUSCA_HEAD/app/tcptest/tunnel.c   Wed Mar 24 20:34:17 2010
@@ -41,10 +41,18 @@
 #include <string.h>
 #include <math.h>
 #include <fcntl.h>
-#include <sys/errno.h>
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#if HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
+#if HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#endif

 #include "include/Array.h"
 #include "include/Stack.h"
=======================================
--- /branches/LUSCA_HEAD/libhelper/ipc.c        Tue Mar 23 05:40:31 2010
+++ /branches/LUSCA_HEAD/libhelper/ipc.c        Wed Mar 24 20:34:17 2010
@@ -43,10 +43,18 @@
 #include <fcntl.h>
 #include <ctype.h>
 #include <signal.h>
-#include <sys/errno.h>
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#if HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
+#if HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#endif

 #include "../include/Array.h"
 #include "../include/Stack.h"
=======================================
--- /branches/LUSCA_HEAD/libiapp/comm.c Wed Mar 24 20:14:05 2010
+++ /branches/LUSCA_HEAD/libiapp/comm.c Wed Mar 24 20:34:17 2010
@@ -46,11 +46,21 @@
 #include <string.h>
 #include <math.h>
 #include <fcntl.h>
-#include <sys/errno.h>
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#if HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
+#if HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#endif
+#if HAVE_NETDB_H
 #include <netdb.h>
+#endif

 #include "../include/Array.h"
 #include "../include/Stack.h"
=======================================
--- /branches/LUSCA_HEAD/libiapp/comm_ips_null.c        Sun Jun 14 06:30:02 2009
+++ /branches/LUSCA_HEAD/libiapp/comm_ips_null.c        Wed Mar 24 20:34:17 2010
@@ -10,8 +10,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
+#if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#if HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif

 #include "../libstat/StatHist.h"
 #include "../libsqinet/sqinet.h"
=======================================
--- /branches/LUSCA_HEAD/libiapp/disk.c Wed Apr  1 16:12:49 2009
+++ /branches/LUSCA_HEAD/libiapp/disk.c Wed Mar 24 20:34:17 2010
@@ -41,9 +41,15 @@
 #include <string.h>
 #include <math.h>
 #include <fcntl.h>
-#include <sys/errno.h>
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#if HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif

 #include "../include/Array.h"
 #include "../include/Stack.h"
=======================================
--- /branches/LUSCA_HEAD/libiapp/fd.c   Fri Apr  3 20:36:45 2009
+++ /branches/LUSCA_HEAD/libiapp/fd.c   Wed Mar 24 20:34:17 2010
@@ -40,8 +40,12 @@
 #include <unistd.h>
 #include <string.h>
 #include <math.h>
+#if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#if HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif

 #include "../include/Array.h"
 #include "../include/Stack.h"
=======================================
--- /branches/LUSCA_HEAD/libsqdns/dns_internal.c        Thu Oct 15 16:08:35 2009
+++ /branches/LUSCA_HEAD/libsqdns/dns_internal.c        Wed Mar 24 20:34:17 2010
@@ -41,10 +41,18 @@
 #include <string.h>
 #include <math.h>
 #include <fcntl.h>
-#include <sys/errno.h>
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#if HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
+#if HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#endif

 #include "../include/Array.h"
 #include "../include/Stack.h"
=======================================
--- /branches/LUSCA_HEAD/libsqinet/inet_legacy.c        Thu Aug 21 18:05:46 2008
+++ /branches/LUSCA_HEAD/libsqinet/inet_legacy.c        Wed Mar 24 20:34:17 2010
@@ -1,13 +1,27 @@
+#include "../include/config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
+#include <assert.h>
+#include <unistd.h>
+#if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#if HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
+#if HAVE_ARPA_INET_H
 #include <arpa/inet.h>
-#include <assert.h>
-#include <unistd.h>
+#endif
+#if HAVE_STRINGS_H
 #include <strings.h>
+#endif
+#if HAVE_STRING_H
 #include <string.h>
+#endif
+#if HAVE_NETDB_H
 #include <netdb.h>
+#endif

 #include "inet_legacy.h"

=======================================
--- /branches/LUSCA_HEAD/libsqname/fqdncache.c  Thu Oct 15 16:08:35 2009
+++ /branches/LUSCA_HEAD/libsqname/fqdncache.c  Wed Mar 24 20:34:17 2010
@@ -41,11 +41,21 @@
 #include <string.h>
 #include <math.h>
 #include <fcntl.h>
-#include <sys/errno.h>
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#if HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
+#if HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#endif
+#if HAVE_NETDB_H
 #include <netdb.h>
+#endif

 #include "../include/Array.h"
 #include "../include/Stack.h"
=======================================
--- /branches/LUSCA_HEAD/libsqname/ipcache.c    Thu Oct 15 16:08:35 2009
+++ /branches/LUSCA_HEAD/libsqname/ipcache.c    Wed Mar 24 20:34:17 2010
@@ -38,14 +38,26 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#if HAVE_STRING_H
 #include <string.h>
+#endif
 #include <math.h>
 #include <fcntl.h>
-#include <sys/errno.h>
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#if HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
+#if HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#endif
+#if HAVE_NETDB_H
 #include <netdb.h>
+#endif

 #include "../include/Array.h"
 #include "../include/Stack.h"
=======================================
--- /branches/LUSCA_HEAD/libsqstore/store_file_ufs.c Wed Jul 22 07:37:20 2009 +++ /branches/LUSCA_HEAD/libsqstore/store_file_ufs.c Wed Mar 24 20:34:17 2010
@@ -1,9 +1,13 @@
+#include "../include/config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/errno.h>
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif

 #include "../include/config.h"
 #include "../include/squid_md5.h"
=======================================
--- /branches/LUSCA_HEAD/src/wccp2.c    Thu Aug 21 03:13:33 2008
+++ /branches/LUSCA_HEAD/src/wccp2.c    Wed Mar 24 20:34:17 2010
@@ -35,7 +35,9 @@
 #include "squid.h"

 #if USE_WCCPv2
+#if HAVE_NETDB_H
 #include <netdb.h>
+#endif

 #define WCCP_PORT 2048
 #define WCCP_RESPONSE_SIZE 12448

--
You received this message because you are subscribed to the Google Groups 
"lusca-commit" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/lusca-commit?hl=en.

Reply via email to