INN commit: trunk (11 files)

INN Commit rra at isc.org
Thu Dec 4 20:47:20 UTC 2014


    Date: Thursday, December 4, 2014 @ 12:47:19
  Author: iulius
Revision: 9761

Include portable/socket-unix.h only when HAVE_UNIX_DOMAIN_SOCKETS is set

Modified:
  trunk/frontends/ovdb_server.c
  trunk/innd/Makefile
  trunk/innd/cc.c
  trunk/innd/lc.c
  trunk/innfeed/Makefile
  trunk/innfeed/main.c
  trunk/lib/Makefile
  trunk/lib/inndcomm.c
  trunk/lib/localopen.c
  trunk/storage/Makefile
  trunk/storage/ovdb/ovdb.c

-------------------------+
 frontends/ovdb_server.c |    3 +--
 innd/Makefile           |   16 ++++++++--------
 innd/cc.c               |    3 +--
 innd/lc.c               |    3 +--
 innfeed/Makefile        |    7 ++++---
 innfeed/main.c          |    2 +-
 lib/Makefile            |    8 ++++----
 lib/inndcomm.c          |    3 +--
 lib/localopen.c         |    3 +--
 storage/Makefile        |    6 +++---
 storage/ovdb/ovdb.c     |    3 +--
 11 files changed, 26 insertions(+), 31 deletions(-)

Modified: frontends/ovdb_server.c
===================================================================
--- frontends/ovdb_server.c	2014-12-04 20:37:30 UTC (rev 9760)
+++ frontends/ovdb_server.c	2014-12-04 20:47:19 UTC (rev 9761)
@@ -8,7 +8,6 @@
 #include "portable/mmap.h"
 #include "portable/setproctitle.h"
 #include "portable/socket.h"
-#include "portable/socket-unix.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -23,7 +22,7 @@
 #include <time.h>
 
 #ifdef HAVE_UNIX_DOMAIN_SOCKETS
-# include <sys/un.h>
+# include "portable/socket-unix.h"
 #endif
 #include <sys/wait.h>
 

Modified: innd/Makefile
===================================================================
--- innd/Makefile	2014-12-04 20:37:30 UTC (rev 9760)
+++ innd/Makefile	2014-12-04 20:47:19 UTC (rev 9761)
@@ -149,14 +149,14 @@
   ../include/inn/system.h ../include/inn/macros.h \
   ../include/portable/macros.h ../include/portable/stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
-  ../include/inn/macros.h ../include/portable/socket-unix.h \
-  ../include/inn/innconf.h ../include/inn/defines.h innd.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/inn/buffer.h \
-  ../include/inn/history.h ../include/inn/messages.h \
-  ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
-  ../include/inn/xwrite.h ../include/inn/nntp.h ../include/inn/paths.h \
-  ../include/inn/storage.h ../include/inn/options.h
+  ../include/inn/macros.h ../include/inn/innconf.h \
+  ../include/inn/defines.h innd.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/buffer.h ../include/inn/history.h \
+  ../include/inn/messages.h ../include/inn/timer.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/nntp.h \
+  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
+  ../include/portable/socket-unix.h
 nc.o: nc.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/macros.h \
   ../include/portable/macros.h ../include/portable/stdbool.h \

Modified: innd/cc.c
===================================================================
--- innd/cc.c	2014-12-04 20:37:30 UTC (rev 9760)
+++ innd/cc.c	2014-12-04 20:47:19 UTC (rev 9761)
@@ -14,10 +14,9 @@
 
 #include "config.h"
 #include "clibrary.h"
-#include "portable/socket-unix.h"
 
 #ifdef HAVE_UNIX_DOMAIN_SOCKETS
-# include <sys/un.h>
+# include "portable/socket-unix.h"
 #endif
 
 #include "inn/innconf.h"

Modified: innd/lc.c
===================================================================
--- innd/lc.c	2014-12-04 20:37:30 UTC (rev 9760)
+++ innd/lc.c	2014-12-04 20:47:19 UTC (rev 9761)
@@ -8,14 +8,13 @@
 
 #include "config.h"
 #include "clibrary.h"
-#include "portable/socket-unix.h"
 
 #include "inn/innconf.h"
 #include "innd.h"
 
 
 #ifdef HAVE_UNIX_DOMAIN_SOCKETS
-# include <sys/un.h>
+# include "portable/socket-unix.h"
 
 static char	*LCpath = NULL;
 static CHANNEL	*LCchan;

Modified: innfeed/Makefile
===================================================================
--- innfeed/Makefile	2014-12-04 20:37:30 UTC (rev 9760)
+++ innfeed/Makefile	2014-12-04 20:47:19 UTC (rev 9761)
@@ -184,9 +184,10 @@
   ../include/config.h ../include/inn/defines.h ../include/inn/options.h \
   ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
   ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/inn/innconf.h \
-  ../include/inn/messages.h ../include/inn/version.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/portable/getnameinfo.h ../include/portable/socket-unix.h \
+  ../include/inn/innconf.h ../include/inn/messages.h \
+  ../include/inn/version.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h \
   ../include/inn/storage.h ../include/inn/options.h article.h misc.h \
   buffer.h configfile.h connection.h endpoint.h host.h innlistener.h \
   tape.h

Modified: innfeed/main.c
===================================================================
--- innfeed/main.c	2014-12-04 20:37:30 UTC (rev 9760)
+++ innfeed/main.c	2014-12-04 20:47:19 UTC (rev 9761)
@@ -26,7 +26,7 @@
 #include <time.h>
 
 #if defined(HAVE_UNIX_DOMAIN_SOCKETS)
-# include <sys/un.h>
+# include "portable/socket-unix.h"
 #endif
 
 #include "inn/innconf.h"

Modified: lib/Makefile
===================================================================
--- lib/Makefile	2014-12-04 20:37:30 UTC (rev 9760)
+++ lib/Makefile	2014-12-04 20:47:19 UTC (rev 9761)
@@ -272,10 +272,10 @@
   ../include/inn/system.h ../include/inn/macros.h \
   ../include/portable/macros.h ../include/portable/stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
-  ../include/inn/macros.h ../include/portable/socket-unix.h \
-  ../include/inn/innconf.h ../include/inn/defines.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
-  ../include/inn/nntp.h ../include/inn/paths.h
+  ../include/inn/macros.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/nntp.h \
+  ../include/inn/paths.h ../include/portable/socket-unix.h
 lockfile.o: lockfile.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/macros.h \
   ../include/portable/macros.h ../include/portable/stdbool.h \

Modified: lib/inndcomm.c
===================================================================
--- lib/inndcomm.c	2014-12-04 20:37:30 UTC (rev 9760)
+++ lib/inndcomm.c	2014-12-04 20:47:19 UTC (rev 9761)
@@ -6,7 +6,6 @@
 #include "config.h"
 #include "clibrary.h"
 #include "portable/socket.h"
-#include "portable/socket-unix.h"
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -24,7 +23,7 @@
 #endif
 
 #ifdef HAVE_UNIX_DOMAIN_SOCKETS
-# include <sys/un.h>
+# include "portable/socket-unix.h"
 #endif
 
 #include "inn/innconf.h"

Modified: lib/localopen.c
===================================================================
--- lib/localopen.c	2014-12-04 20:37:30 UTC (rev 9760)
+++ lib/localopen.c	2014-12-04 20:47:19 UTC (rev 9761)
@@ -4,7 +4,6 @@
 
 #include "config.h"
 #include "clibrary.h"
-#include "portable/socket-unix.h"
 #include <errno.h>
 #include <sys/socket.h>
 
@@ -14,7 +13,7 @@
 #include "inn/paths.h"
 
 #ifdef HAVE_UNIX_DOMAIN_SOCKETS
-# include <sys/un.h>
+# include "portable/socket-unix.h"
 #endif
 
 

Modified: storage/Makefile
===================================================================
--- storage/Makefile	2014-12-04 20:37:30 UTC (rev 9760)
+++ storage/Makefile	2014-12-04 20:47:19 UTC (rev 9761)
@@ -208,14 +208,14 @@
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/portable/socket-unix.h ../include/conffile.h \
-  ../include/inn/fdflag.h ../include/inn/innconf.h \
+  ../include/conffile.h ../include/inn/fdflag.h ../include/inn/innconf.h \
   ../include/inn/defines.h ../include/inn/libinn.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h \
   ../include/inn/messages.h ../include/inn/newsuser.h \
   ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
   ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h \
-  ovinterface.h ovdb/ovdb.h ovdb/ovdb-private.h
+  ovinterface.h ovdb/ovdb.h ovdb/ovdb-private.h \
+  ../include/portable/socket-unix.h
 timecaf/caf.o: timecaf/caf.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/macros.h \
   ../include/portable/macros.h ../include/portable/stdbool.h \

Modified: storage/ovdb/ovdb.c
===================================================================
--- storage/ovdb/ovdb.c	2014-12-04 20:37:30 UTC (rev 9760)
+++ storage/ovdb/ovdb.c	2014-12-04 20:47:19 UTC (rev 9761)
@@ -73,7 +73,6 @@
 #include "config.h"
 #include "clibrary.h"
 #include "portable/socket.h"
-#include "portable/socket-unix.h"
 #include <errno.h>
 #include <fcntl.h>
 #ifdef HAVE_LIMITS_H
@@ -109,7 +108,7 @@
 #include "ovdb-private.h"
 
 #ifdef HAVE_UNIX_DOMAIN_SOCKETS
-# include <sys/un.h>
+# include "portable/socket-unix.h"
 #endif
 
 #ifndef HAVE_DB_H



More information about the inn-committers mailing list