INN commit: trunk (14 files)

Sun Dec 7 20:39:50 UTC 2014

Date: Sunday, December 7, 2014 @ 12:39:49
  Author: iulius
Revision: 9763

Use system.h from rra-c-util for include/clibrary.h

Keep INN-specific stuff during the synchronization from upstream.

Modified:
  trunk/authprogs/Makefile
  trunk/backends/Makefile
  trunk/contrib/newsresp.c
  trunk/contrib/reset-cnfs.c
  trunk/expire/Makefile
  trunk/frontends/Makefile
  trunk/history/Makefile
  trunk/include/clibrary.h
  trunk/innd/Makefile
  trunk/innfeed/Makefile
  trunk/lib/Makefile
  trunk/nnrpd/Makefile
  trunk/storage/Makefile
  trunk/support/getrra-c-util

-----------------------+
 authprogs/Makefile    |   60 ++++----
 backends/Makefile     |  138 ++++++++++---------
 contrib/newsresp.c    |    1 
 contrib/reset-cnfs.c  |    1 
 expire/Makefile       |   62 ++++----
 frontends/Makefile    |   92 ++++++------
 history/Makefile      |   29 ++--
 include/clibrary.h    |  264 +++++++++++++++++++++----------------
 innd/Makefile         |  213 +++++++++++++++---------------
 innfeed/Makefile      |   90 ++++++------
 lib/Makefile          |  340 ++++++++++++++++++++++++++----------------------
 nnrpd/Makefile        |  186 +++++++++++++-------------
 storage/Makefile      |  196 ++++++++++++++-------------
 support/getrra-c-util |   70 +++++++++
 14 files changed, 977 insertions(+), 765 deletions(-)

Modified: authprogs/Makefile
===================================================================

--- authprogs/Makefile	2014-12-07 18:33:37 UTC (rev 9762)
+++ authprogs/Makefile	2014-12-07 20:39:49 UTC (rev 9763)
@@ -79,52 +79,56 @@
   ../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 libauth.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/defines.h ../include/inn/messages.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h
+  ../include/inn/macros.h ../include/portable/stdbool.h libauth.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h
 ckpasswd.o: ckpasswd.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/messages.h ../include/inn/qio.h \
-  ../include/inn/defines.h ../include/inn/vector.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h libauth.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/messages.h ../include/inn/qio.h ../include/inn/defines.h \
+  ../include/inn/vector.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
+  ../include/inn/xwrite.h libauth.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h
 domain.o: domain.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/messages.h \
-  ../include/inn/libinn.h ../include/inn/defines.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h libauth.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/messages.h ../include/inn/libinn.h \
+  ../include/inn/defines.h ../include/inn/xmalloc.h \
+  ../include/inn/xwrite.h libauth.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h
 ident.o: ident.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/messages.h \
-  ../include/inn/network.h ../include/inn/defines.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h libauth.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/messages.h ../include/inn/network.h \
+  ../include/inn/defines.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  libauth.h
 libauth.o: libauth.c ../include/config.h ../include/inn/defines.h \
   ../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.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/messages.h libauth.h ../include/inn/defines.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/messages.h libauth.h \
+  ../include/inn/defines.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h
 radius.o: radius.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/md5.h ../include/inn/messages.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
-  ../include/inn/nntp.h ../include/inn/paths.h ../include/conffile.h \
-  libauth.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h ../include/inn/md5.h \
+  ../include/inn/messages.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/nntp.h \
+  ../include/inn/paths.h ../include/conffile.h libauth.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
   ../include/portable/getnameinfo.h

Modified: backends/Makefile
===================================================================
--- backends/Makefile	2014-12-07 18:33:37 UTC (rev 9762)
+++ backends/Makefile	2014-12-07 20:39:49 UTC (rev 9763)
@@ -126,15 +126,17 @@
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h \
-  ../include/inn/hashtab.h ../include/inn/qio.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/hashtab.h ../include/inn/qio.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/paths.h
 archive.o: archive.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/buffer.h ../include/inn/innconf.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/buffer.h ../include/inn/innconf.h \
   ../include/inn/defines.h ../include/inn/messages.h ../include/inn/qio.h \
   ../include/inn/vector.h ../include/inn/wire.h ../include/inn/libinn.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h \
@@ -143,115 +145,125 @@
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h \
-  ../include/inn/timer.h ../include/inn/wire.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h \
-  ../include/inn/storage.h ../include/inn/options.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/timer.h ../include/inn/wire.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h
 buffchan.o: buffchan.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h ../include/inn/qio.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
-  ../include/inn/paths.h map.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/qio.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h \
+  map.h
 cvtbatch.o: cvtbatch.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h ../include/inn/qio.h \
-  ../include/inn/wire.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
-  ../include/inn/xwrite.h ../include/inn/paths.h ../include/inn/storage.h \
-  ../include/inn/options.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/qio.h ../include/inn/wire.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h
 filechan.o: filechan.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
-  ../include/inn/paths.h map.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h \
+  map.h
 innbind.o: innbind.c ../include/config.h ../include/inn/defines.h \
   ../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.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/libinn.h ../include/inn/defines.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h \
-  ../include/inn/messages.h ../include/inn/newsuser.h \
-  ../include/inn/vector.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/libinn.h \
+  ../include/inn/defines.h ../include/inn/xmalloc.h \
+  ../include/inn/xwrite.h ../include/inn/messages.h \
+  ../include/inn/newsuser.h ../include/inn/vector.h
 inndf.o: inndf.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h \
-  ../include/inn/overview.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/qio.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/overview.h \
+  ../include/inn/storage.h ../include/inn/options.h ../include/inn/qio.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/paths.h
 innxbatch.o: innxbatch.c ../include/config.h ../include/inn/defines.h \
   ../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.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/innconf.h ../include/inn/defines.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/macros.h ../include/portable/stdbool.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/innconf.h \
+  ../include/inn/defines.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
 innxmit.o: innxmit.c ../include/config.h ../include/inn/defines.h \
   ../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.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/history.h ../include/inn/defines.h \
-  ../include/inn/innconf.h ../include/inn/messages.h ../include/inn/qio.h \
-  ../include/inn/timer.h ../include/inn/wire.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/portable/stdbool.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/history.h \
+  ../include/inn/defines.h ../include/inn/innconf.h \
+  ../include/inn/messages.h ../include/inn/qio.h ../include/inn/timer.h \
+  ../include/inn/wire.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
 map.o: map.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h \
   map.h
 ninpaths.o: ninpaths.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/macros.h ../include/portable/stdbool.h
 nntpget.o: nntpget.c ../include/config.h ../include/inn/defines.h \
   ../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.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/history.h ../include/inn/defines.h \
-  ../include/inn/innconf.h ../include/inn/messages.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/portable/stdbool.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/history.h \
+  ../include/inn/defines.h ../include/inn/innconf.h \
+  ../include/inn/messages.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/nntp.h \
+  ../include/inn/paths.h
 overchan.o: overchan.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h \
-  ../include/inn/overview.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/qio.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/overview.h \
+  ../include/inn/storage.h ../include/inn/options.h ../include/inn/qio.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/paths.h
 shlock.o: shlock.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/messages.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/messages.h
 shrinkfile.o: shrinkfile.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h

Modified: contrib/newsresp.c
===================================================================
--- contrib/newsresp.c	2014-12-07 18:33:37 UTC (rev 9762)
+++ contrib/newsresp.c	2014-12-07 20:39:49 UTC (rev 9763)
@@ -66,7 +66,6 @@
 
 #include "clibrary.h"
 #include "portable/socket.h"
-#include "portable/stdbool.h"
 
 #include <errno.h>
 #ifdef HAVE_SYS_TIME_H

Modified: contrib/reset-cnfs.c
===================================================================
--- contrib/reset-cnfs.c	2014-12-07 18:33:37 UTC (rev 9762)
+++ contrib/reset-cnfs.c	2014-12-07 20:39:49 UTC (rev 9763)
@@ -2,7 +2,6 @@
  * Entire Thing from /dev/zero again. */
 #include "config.h"
 #include "clibrary.h"
-#include "portable/stdbool.h"
 
 #include <errno.h>
 #include <fcntl.h>

Modified: expire/Makefile
===================================================================
--- expire/Makefile	2014-12-07 18:33:37 UTC (rev 9762)
+++ expire/Makefile	2014-12-07 20:39:49 UTC (rev 9763)
@@ -86,26 +86,28 @@
   ../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/inn/messages.h \
-  ../include/inn/libinn.h ../include/inn/defines.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/messages.h ../include/inn/libinn.h \
+  ../include/inn/defines.h ../include/inn/xmalloc.h \
+  ../include/inn/xwrite.h
 expire.o: expire.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/history.h \
-  ../include/inn/defines.h ../include/inn/innconf.h \
-  ../include/inn/messages.h ../include/inn/inndcomm.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/history.h ../include/inn/defines.h \
+  ../include/inn/innconf.h ../include/inn/messages.h \
+  ../include/inn/inndcomm.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h \
   ../include/inn/newsuser.h ../include/inn/paths.h \
   ../include/inn/storage.h ../include/inn/options.h
 expireover.o: expireover.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/macros.h ../include/portable/stdbool.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/ov.h \
   ../include/inn/storage.h ../include/inn/options.h \
   ../include/inn/history.h ../include/inn/paths.h ../include/inn/qio.h \
@@ -114,33 +116,36 @@
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h ../include/inn/qio.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/qio.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h \
   ../include/inn/storage.h ../include/inn/options.h
 grephistory.o: grephistory.c ../include/clibrary.h ../include/config.h \
   ../include/inn/defines.h ../include/inn/system.h ../include/inn/macros.h \
   ../include/portable/macros.h ../include/portable/stdbool.h \
   ../include/config.h ../include/inn/options.h ../include/inn/macros.h \
-  ../include/inn/history.h ../include/inn/defines.h \
-  ../include/inn/innconf.h ../include/inn/messages.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
-  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h
+  ../include/portable/stdbool.h ../include/inn/history.h \
+  ../include/inn/defines.h ../include/inn/innconf.h \
+  ../include/inn/messages.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h \
+  ../include/inn/storage.h ../include/inn/options.h
 makedbz.o: makedbz.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/dbz.h ../include/inn/libinn.h \
-  ../include/inn/defines.h ../include/inn/xmalloc.h \
-  ../include/inn/xwrite.h ../include/inn/innconf.h \
-  ../include/inn/messages.h ../include/inn/newsuser.h \
-  ../include/inn/paths.h ../include/inn/qio.h ../include/inn/storage.h \
-  ../include/inn/options.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/dbz.h ../include/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/innconf.h ../include/inn/messages.h \
+  ../include/inn/newsuser.h ../include/inn/paths.h ../include/inn/qio.h \
+  ../include/inn/storage.h ../include/inn/options.h
 makehistory.o: makehistory.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/buffer.h ../include/inn/history.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/buffer.h ../include/inn/history.h \
   ../include/inn/defines.h ../include/inn/innconf.h \
   ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
   ../include/inn/messages.h ../include/inn/newsuser.h ../include/inn/ov.h \
@@ -151,7 +156,8 @@
   ../include/inn/defines.h ../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/inn/history.h \
-  ../include/inn/defines.h ../include/inn/innconf.h \
-  ../include/inn/messages.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/history.h ../include/inn/defines.h \
+  ../include/inn/innconf.h ../include/inn/messages.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/paths.h

Modified: frontends/Makefile
===================================================================
--- frontends/Makefile	2014-12-07 18:33:37 UTC (rev 9762)
+++ frontends/Makefile	2014-12-07 20:39:49 UTC (rev 9763)
@@ -135,50 +135,54 @@
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h \
-  ../include/inn/inndcomm.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/inndcomm.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/paths.h
 decode.o: decode.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/messages.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/messages.h
 encode.o: encode.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/macros.h ../include/portable/stdbool.h
 getlist.o: getlist.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h ../include/inn/nntp.h \
-  ../include/inn/qio.h ../include/inn/vector.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/nntp.h ../include/inn/qio.h \
+  ../include/inn/vector.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
+  ../include/inn/xwrite.h ../include/inn/paths.h
 inews.o: inews.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/macros.h ../include/portable/stdbool.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/nntp.h ../include/inn/paths.h
 innconfval.o: innconfval.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h \
-  ../include/inn/version.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/version.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h
 ovdb_init.o: ovdb_init.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h \
   ../include/inn/innconf.h ../include/inn/messages.h ../include/inn/ov.h \
   ../include/inn/storage.h ../include/inn/options.h \
@@ -188,46 +192,47 @@
   ../include/inn/defines.h ../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/setproctitle.h \
-  ../include/inn/innconf.h ../include/inn/defines.h \
-  ../include/inn/messages.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/ov.h \
-  ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/setproctitle.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/messages.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/options.h \
   ../include/inn/history.h ../storage/ovdb/ovdb.h \
   ../storage/ovdb/ovdb-private.h
 ovdb_server.o: ovdb_server.c ../include/config.h ../include/inn/defines.h \
   ../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/mmap.h \
-  ../include/portable/setproctitle.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/portable/socket-unix.h ../include/inn/fdflag.h \
-  ../include/inn/innconf.h ../include/inn/defines.h \
-  ../include/inn/messages.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.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 ../storage/ovdb/ovdb.h \
-  ../storage/ovdb/ovdb-private.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/mmap.h ../include/portable/setproctitle.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/portable/socket-unix.h \
+  ../include/inn/fdflag.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/messages.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.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 \
+  ../storage/ovdb/ovdb.h ../storage/ovdb/ovdb-private.h
 ovdb_stat.o: ovdb_stat.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
-  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/ov.h \
+  ../include/inn/storage.h ../include/inn/options.h \
   ../include/inn/history.h ../include/inn/paths.h ../include/inn/storage.h \
   ../storage/ovdb/ovdb.h ../storage/ovdb/ovdb-private.h
 rnews.o: rnews.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/fdflag.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/fdflag.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.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/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
   ../include/inn/options.h ../include/inn/wire.h
@@ -235,7 +240,8 @@
   ../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/inn/buffer.h ../include/inn/innconf.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/buffer.h ../include/inn/innconf.h \
   ../include/inn/defines.h ../include/inn/messages.h ../include/inn/qio.h \
   ../include/inn/wire.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
   ../include/inn/xwrite.h ../include/inn/storage.h \

Modified: history/Makefile
===================================================================
--- history/Makefile	2014-12-07 18:33:37 UTC (rev 9762)
+++ history/Makefile	2014-12-07 20:39:49 UTC (rev 9763)
@@ -102,11 +102,12 @@
   ../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/inn/history.h \
-  ../include/inn/defines.h ../include/inn/messages.h \
-  ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
-  ../include/inn/xwrite.h ../include/inn/storage.h \
-  ../include/inn/options.h hisinterface.h hismethods.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/history.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/timer.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/storage.h ../include/inn/options.h hisinterface.h \
+  hismethods.h
 hismethods.o: hismethods.c hisinterface.h ../include/config.h \
   ../include/inn/defines.h ../include/inn/system.h ../include/inn/macros.h \
   ../include/portable/macros.h ../include/portable/stdbool.h \
@@ -115,12 +116,12 @@
   ../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 hisinterface.h hisv6/hisv6.h \
-  hisv6/hisv6-private.h ../include/inn/history.h ../include/inn/defines.h \
-  ../include/inn/storage.h ../include/inn/options.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
-  ../include/inn/dbz.h ../include/inn/fdflag.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/inn/innconf.h \
-  ../include/inn/timer.h ../include/inn/qio.h ../include/inn/sequence.h \
-  ../include/inn/inndcomm.h
+  ../include/inn/macros.h ../include/portable/stdbool.h hisinterface.h \
+  hisv6/hisv6.h hisv6/hisv6-private.h ../include/inn/history.h \
+  ../include/inn/defines.h ../include/inn/storage.h \
+  ../include/inn/options.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/dbz.h \
+  ../include/inn/fdflag.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/innconf.h ../include/inn/timer.h ../include/inn/qio.h \
+  ../include/inn/sequence.h ../include/inn/inndcomm.h

Modified: include/clibrary.h
===================================================================
--- include/clibrary.h	2014-12-07 18:33:37 UTC (rev 9762)
+++ include/clibrary.h	2014-12-07 20:39:49 UTC (rev 9763)
@@ -1,57 +1,68 @@
-/*  $Id$
-**
-**  Here be declarations of routines and variables in the C library.
-**  Including this file is the equivalent of including all of the following
-**  headers, portably:
-**
-**      #include "inn/macros.h"
-**      #include <limits.h>
-**      #include <sys/types.h>
-**      #include <stdarg.h>
-**      #include <stdio.h>
-**      #include <stdlib.h>
-**      #include <stddef.h>
-**      #include <stdint.h>
-**      #include <string.h>
-**      #include <unistd.h>
-**
-**  Missing functions are provided via #define or prototyped if we'll be
-**  adding them to INN's library.  If the system doesn't define a SUN_LEN
-**  macro, one will be provided.  Also provides some standard #defines.
-*/
+/* $Id$
+ *
+ * Standard system includes and portability adjustments.
+ *
+ * Declarations of routines and variables in the C library.  Including this
+ * file is the equivalent of including all of the following headers,
+ * portably:
+ *
+ *     #include "inn/macros.h"
+ *     #include <inttypes.h>
+ *     #include <limits.h>
+ *     #include <stdarg.h>
+ *     #include <stdbool.h>
+ *     #include <stddef.h>
+ *     #include <stdio.h>
+ *     #include <stdlib.h>
+ *     #include <stdint.h>
+ *     #include <string.h>
+ *     #include <strings.h>
+ *     #include <sys/types.h>
+ *     #include <unistd.h>
+ *
+ * Missing functions are provided via #define or prototyped if available from
+ * the portable helper library.  Also provides some standard #defines.
+ *
+ * The canonical version of this file is maintained in the rra-c-util package,
+ * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
+ *
+ * Written by Russ Allbery <eagle at eyrie.org>
+ *
+ * The authors hereby relinquish any claim to any copyright that they may have
+ * in this work, whether granted under contract or by operation of law or
+ * international treaty, and hereby commit to the public, at large, that they
+ * shall not, at any time in the future, seek to enforce any copyright in this
+ * work against any person or entity, or prevent any person or entity from
+ * copying, publishing, distributing or creating derivative works of this
+ * work.
+ */
 
 #ifndef CLIBRARY_H
 #define CLIBRARY_H 1
 
 /* Make sure we have our configuration information. */
 #include "config.h"
+
+/* BEGIN_DECL and __attribute__. */
 #include "inn/macros.h"
 
-/* Assume stdarg is available; don't bother with varargs support any more.
-   We need this to be able to declare vsnprintf. */
+/* A set of standard ANSI C headers.  We don't care about pre-ANSI systems. */
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#include <limits.h>
 #include <stdarg.h>
-
-/* This is the same method used by autoconf as of 2000-07-29 for including
-   the basic system headers with the addition of handling of strchr,
-   strrchr, and memcpy.  Note that we don't attempt to declare any of the
-   functions; the number of systems left without ANSI-compatible function
-   prototypes isn't high enough to be worth the trouble.  */
-#include <limits.h>
+#include <stddef.h>
+#if HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #include <stdio.h>
-#include <sys/types.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>
 #if HAVE_STRINGS_H
 # include <strings.h>
 #endif
-
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#if HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <sys/types.h>
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
@@ -61,111 +72,136 @@
 # include <sys/bitypes.h>
 #endif
 
+/* Get the bool type. */
+#include "portable/stdbool.h"
+
+/* Windows provides snprintf under a different name. */
+#ifdef _WIN32
+# define snprintf _snprintf
+#endif
+
+/* Define sig_atomic_t if it's not available in signal.h. */
+#ifndef HAVE_SIG_ATOMIC_T
+typedef int sig_atomic_t;
+#endif
+
+/* Windows does not define ssize_t. */
+#ifndef HAVE_SSIZE_T
+typedef ptrdiff_t ssize_t;
+#endif
+
+/*
+ * POSIX requires that these be defined in <unistd.h>.  If one of them has
+ * been defined, all the rest almost certainly have.
+ */
+#ifndef STDIN_FILENO
+# define STDIN_FILENO  0
+# define STDOUT_FILENO 1
+# define STDERR_FILENO 2
+#endif
+
+/*
+ * This almost certainly isn't necessary, but it's not hurting anything.
+ * gcc assumes that if SEEK_SET isn't defined none of the rest are either,
+ * so we certainly can as well.
+ */
+#ifndef SEEK_SET
+# define SEEK_SET 0
+# define SEEK_CUR 1
+# define SEEK_END 2
+#endif
+
+/*
+ * C99 requires va_copy.  Older versions of GCC provide __va_copy.  Per the
+ * Autoconf manual, memcpy is a generally portable fallback.
+ */
+#ifndef va_copy
+# ifdef __va_copy
+#  define va_copy(d, s) __va_copy((d), (s))
+# else
+#  define va_copy(d, s) memcpy(&(d), &(s), sizeof(va_list))
+# endif
+#endif
+
 BEGIN_DECLS
 
-/* Handle defining fseeko and ftello.  If HAVE_FSEEKO is defined, the system
-   header files take care of this for us.  Otherwise, see if we're building
-   with large file support.  If we are, we have to provide some real fseeko
-   and ftello implementation; declare them if they're not already declared and
-   we'll use replacement versions in libinn.  If we're not using large files,
-   we can safely just use fseek and ftell.
-
-   We'd rather use fseeko and ftello unconditionally, even when we're not
-   building with large file support, since they're a better interface.
-   Unfortunately, they're available but not declared on some systems unless
-   building with large file support, the AC_FUNC_FSEEKO Autoconf function
-   always turns on large file support, and our fake declarations won't work on
-   some systems (like HP_UX).  This is the best compromise we've been able to
-   come up with. */
+/*
+ * Handle defining fseeko and ftello.  If HAVE_FSEEKO is defined, the system
+ * header files take care of this for us.  Otherwise, see if we're building
+ * with large file support.  If we are, we have to provide some real fseeko
+ * and ftello implementation; declare them if they're not already declared and
+ * we'll use replacement versions in libinn.  If we're not using large files,
+ * we can safely just use fseek and ftell.
+ *
+ * We'd rather use fseeko and ftello unconditionally, even when we're not
+ * building with large file support, since they're a better interface.
+ * Unfortunately, they're available but not declared on some systems unless
+ * building with large file support, the AC_FUNC_FSEEKO Autoconf function
+ * always turns on large file support, and our fake declarations won't work on
+ * some systems (like HP_UX).  This is the best compromise we've been able to
+ * come up with.
+ */
 #if !HAVE_FSEEKO
 # if DO_LARGEFILES
 #  if !HAVE_DECL_FSEEKO
-extern int              fseeko(FILE *, off_t, int);
+extern int fseeko(FILE *, off_t, int);
 #  endif
 #  if !HAVE_DECL_FTELLO
-extern off_t            ftello(FILE *);
+extern off_t ftello(FILE *);
 #  endif
 # else
 #  define fseeko(f, o, w) fseek((f), (long)(o), (w))
-#  define ftello(f)       ftell(f)
+#  define ftello(f) ftell(f)
 # endif
 #endif
 
-/* Provide prototypes for functions not declared in system headers.  Use the
-   HAVE_DECL macros for those functions that may be prototyped but
-   implemented incorrectly or implemented without a prototype. */
+/* Other prototypes. */
+#if !HAVE_DECL_PREAD
+extern ssize_t pread(int, void *, size_t, off_t);
+#endif
+#if !HAVE_DECL_PWRITE
+extern ssize_t pwrite(int, const void *, size_t, off_t);
+#endif
+#if !HAVE_SYMLINK
+extern int symlink(const char *, const char *);
+#endif
+
+/*
+ * Provide prototypes for functions not declared in system headers.  Use the
+ * HAVE_DECL macros for those functions that may be prototyped but implemented
+ * incorrectly or implemented without a prototype.
+ */
 #if !HAVE_ASPRINTF
-extern int              asprintf(char **, const char *, ...)
+extern int asprintf(char **, const char *, ...)
     __attribute__((__format__(printf, 2, 3)));
-extern int              vasprintf(char **, const char *, va_list);
+extern int vasprintf(char **, const char *, va_list);
 #endif
-#if !HAVE_MKSTEMP
-extern int              mkstemp(char *);
+#if !HAVE_DECL_SNPRINTF
+extern int snprintf(char *, size_t, const char *, ...)
+    __attribute__((__format__(printf, 3, 4)));
 #endif
-#if !HAVE_DECL_PREAD
-extern ssize_t          pread(int, void *, size_t, off_t);
+#if !HAVE_DECL_VSNPRINTF
+extern int vsnprintf(char *, size_t, const char *, va_list);
 #endif
-#if !HAVE_DECL_PWRITE
-extern ssize_t          pwrite(int, const void *, size_t, off_t);
+#if !HAVE_MKSTEMP
+extern int mkstemp(char *);
 #endif
 #if !HAVE_REALLOCARRAY
-extern void             *reallocarray(void *, size_t, size_t);
+extern void *reallocarray(void *, size_t, size_t);
 #endif
 #if !HAVE_SETENV
-extern int              setenv(const char *, const char *, int);
+extern int setenv(const char *, const char *, int);
 #endif
 #if !HAVE_SETEUID
-extern int              seteuid(uid_t);
+extern int seteuid(uid_t);
 #endif
-#if !HAVE_DECL_SNPRINTF
-extern int              snprintf(char *, size_t, const char *, ...)
-    __attribute__((__format__(printf, 3, 4)));
-#endif
 #if !HAVE_DECL_STRLCAT
-extern size_t           strlcat(char *, const char *, size_t);
+extern size_t strlcat(char *, const char *, size_t);
 #endif
 #if !HAVE_DECL_STRLCPY
-extern size_t           strlcpy(char *, const char *, size_t);
+extern size_t strlcpy(char *, const char *, size_t);
 #endif
-#if !HAVE_SYMLINK
-extern int              symlink(const char *, const char *);
-#endif
-#if !HAVE_DECL_VSNPRINTF
-extern int              vsnprintf(char *, size_t, const char *, va_list);
-#endif
 
-/* In case <signal.h> does not define sig_atomic_t. */
-#if !HAVE_SIG_ATOMIC_T
-typedef int             sig_atomic_t;
-#endif
-
 END_DECLS
 
-/* This almost certainly isn't necessary, but it's not hurting anything.
-   gcc assumes that if SEEK_SET isn't defined none of the rest are either,
-   so we certainly can as well. */
-#ifndef SEEK_SET
-# define SEEK_SET 0
-# define SEEK_CUR 1
-# define SEEK_END 2
-#endif
-
-/* POSIX requires that these be defined in <unistd.h>.  If one of them has
-   been defined, all the rest almost certainly have. */
-#ifndef STDIN_FILENO
-# define STDIN_FILENO   0
-# define STDOUT_FILENO  1
-# define STDERR_FILENO  2
-#endif
-
-/* C99 requires va_copy.  Older versions of GCC provide __va_copy.  Per the
-   Autoconf manual, memcpy is a generally portable fallback. */
-#ifndef va_copy
-# ifdef __va_copy
-#  define va_copy(d, s)         __va_copy((d), (s))
-# else
-#  define va_copy(d, s)         memcpy(&(d), &(s), sizeof(va_list))
-# endif
-#endif
-
 #endif /* !CLIBRARY_H */

Modified: innd/Makefile
===================================================================
--- innd/Makefile	2014-12-07 18:33:37 UTC (rev 9762)
+++ innd/Makefile	2014-12-07 20:39:49 UTC (rev 9763)
@@ -73,9 +73,9 @@
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/md5.h ../include/inn/ov.h \
-  ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h ../include/inn/md5.h \
+  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/options.h \
   ../include/inn/history.h ../include/inn/storage.h \
   ../include/inn/vector.h ../include/inn/wire.h innd.h \
   ../include/portable/socket.h ../include/portable/getaddrinfo.h \
@@ -87,9 +87,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/qio.h \
-  innd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/socket-unix.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/qio.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 \
@@ -100,23 +101,25 @@
   ../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/inn/fdflag.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/network.h innd.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/portable/stdbool.h \
+  ../include/inn/fdflag.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/network.h innd.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
 icd.o: icd.c ../include/config.h ../include/inn/defines.h \
   ../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/mmap.h \
-  ../include/inn/fdflag.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/innconf.h ../include/inn/defines.h ../include/inn/mmap.h \
-  innd.h ../include/inn/buffer.h ../include/inn/history.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/mmap.h ../include/inn/fdflag.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/mmap.h innd.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 \
@@ -125,10 +128,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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h \
-  ../include/inn/newsuser.h ../include/innperl.h innd.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/newsuser.h ../include/innperl.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/timer.h ../include/inn/libinn.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/nntp.h \
@@ -138,7 +141,8 @@
   ../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/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h \
   ../include/inn/innconf.h innd.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
@@ -149,55 +153,59 @@
   ../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/inn/innconf.h \
-  ../include/inn/defines.h innd.h ../include/portable/socket.h \
+  ../include/inn/macros.h ../include/portable/stdbool.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 \
+  ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h ../include/inn/qio.h \
+  ../include/inn/version.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/paths.h ../include/inn/storage.h ../include/inn/options.h
+newsfeeds.o: newsfeeds.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/qio.h ../include/inn/version.h \
-  innd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/inn/macros.h ../include/portable/stdbool.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
-newsfeeds.o: newsfeeds.c ../include/config.h ../include/inn/defines.h \
-  ../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/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
 ng.o: ng.c ../include/config.h ../include/inn/defines.h \
   ../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/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/ov.h ../include/inn/storage.h
+  ../include/inn/macros.h ../include/portable/stdbool.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/ov.h \
+  ../include/inn/storage.h
 perl.o: perl.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/wire.h ../include/inn/defines.h \
-  innd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/wire.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 \
@@ -208,20 +216,21 @@
   ../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 innd.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/buffer.h ../include/inn/history.h \
-  ../include/inn/defines.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/portable/stdbool.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/defines.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
 python.o: python.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/innconf.h ../include/inn/defines.h ../include/inn/wire.h \
-  innd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/stdbool.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/wire.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 \
@@ -231,69 +240,71 @@
   ../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.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/fdflag.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/network.h ../include/inn/network-innbind.h \
+  ../include/inn/vector.h innd.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
+site.o: site.c ../include/config.h ../include/inn/defines.h \
+  ../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/stdbool.h \
+  ../include/inn/fdflag.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/fdflag.h ../include/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/network.h \
-  ../include/inn/network-innbind.h ../include/inn/vector.h innd.h \
+  ../include/inn/innconf.h ../include/inn/defines.h innd.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
-site.o: site.c ../include/config.h ../include/inn/defines.h \
+status.o: status.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/fdflag.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/inn/innconf.h \
-  ../include/inn/defines.h innd.h ../include/inn/buffer.h \
+  ../include/portable/getnameinfo.h ../include/inn/network.h \
+  ../include/inn/defines.h ../include/inn/innconf.h \
+  ../include/inn/version.h innd.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
-status.o: status.c ../include/config.h ../include/inn/defines.h \
+  ../include/inn/storage.h ../include/inn/options.h ../include/innperl.h
+util.o: util.c ../include/config.h ../include/inn/defines.h \
   ../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.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/fdflag.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/network.h ../include/inn/defines.h \
-  ../include/inn/innconf.h ../include/inn/version.h innd.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/innperl.h
-util.o: util.c ../include/config.h ../include/inn/defines.h \
-  ../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/inn/fdflag.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h innd.h \
-  ../include/inn/buffer.h ../include/inn/history.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  innd.h ../include/inn/buffer.h ../include/inn/history.h \
   ../include/inn/messages.h ../include/inn/timer.h ../include/inn/nntp.h \
   ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h
 wip.o: wip.c ../include/config.h ../include/inn/defines.h \
   ../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/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/portable/stdbool.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
 tinyleaf.o: tinyleaf.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/dispatch.h \
-  ../include/inn/messages.h ../include/inn/md5.h ../include/inn/defines.h \
-  ../include/inn/nntp.h ../include/inn/utility.h ../include/inn/vector.h \
-  ../include/inn/version.h ../include/inn/libinn.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/dispatch.h ../include/inn/messages.h ../include/inn/md5.h \
+  ../include/inn/defines.h ../include/inn/nntp.h ../include/inn/utility.h \
+  ../include/inn/vector.h ../include/inn/version.h ../include/inn/libinn.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h

Modified: innfeed/Makefile
===================================================================
--- innfeed/Makefile	2014-12-07 18:33:37 UTC (rev 9762)
+++ innfeed/Makefile	2014-12-07 20:39:49 UTC (rev 9763)
@@ -103,8 +103,9 @@
   ../include/portable/macros.h ../include/portable/stdbool.h \
   ../include/config.h ../include/inn/defines.h ../include/inn/options.h \
   ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
-  ../include/portable/mmap.h ../include/inn/messages.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/portable/stdbool.h ../include/portable/mmap.h \
+  ../include/inn/messages.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 endpoint.h
 buffer.o: buffer.c innfeed.h ../include/inn/timer.h \
@@ -112,8 +113,9 @@
   ../include/portable/macros.h ../include/portable/stdbool.h \
   ../include/config.h ../include/inn/defines.h ../include/inn/options.h \
   ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
-  ../include/inn/messages.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h buffer.h misc.h
+  ../include/portable/stdbool.h ../include/inn/messages.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  buffer.h misc.h
 config_l.o: config_l.c innfeed.h ../include/inn/timer.h \
   ../include/inn/defines.h ../include/inn/system.h ../include/inn/macros.h \
   ../include/portable/macros.h ../include/portable/stdbool.h \
@@ -125,57 +127,60 @@
   ../include/portable/macros.h ../include/portable/stdbool.h \
   ../include/config.h ../include/inn/defines.h ../include/inn/options.h \
   ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
-  ../include/inn/messages.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h configfile.h misc.h
+  ../include/portable/stdbool.h ../include/inn/messages.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  configfile.h misc.h
 connection.o: connection.c innfeed.h ../include/inn/timer.h \
   ../include/inn/defines.h ../include/inn/system.h ../include/inn/macros.h \
   ../include/portable/macros.h ../include/portable/stdbool.h \
   ../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/fdflag.h \
-  ../include/inn/innconf.h ../include/inn/messages.h \
-  ../include/inn/network.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h article.h misc.h \
-  buffer.h configfile.h connection.h endpoint.h host.h
+  ../include/portable/stdbool.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/fdflag.h ../include/inn/innconf.h \
+  ../include/inn/messages.h ../include/inn/network.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  article.h misc.h buffer.h configfile.h connection.h endpoint.h host.h
 endpoint.o: endpoint.c innfeed.h ../include/inn/timer.h \
   ../include/inn/defines.h ../include/inn/system.h ../include/inn/macros.h \
   ../include/portable/macros.h ../include/portable/stdbool.h \
   ../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/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h buffer.h misc.h \
-  configfile.h endpoint.h host.h
+  ../include/portable/stdbool.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/innconf.h ../include/inn/messages.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  buffer.h misc.h configfile.h endpoint.h host.h
 host.o: host.c innfeed.h ../include/inn/timer.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/macros.h \
   ../include/portable/macros.h ../include/portable/stdbool.h \
   ../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/network.h \
-  ../include/inn/version.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h article.h misc.h \
-  buffer.h configfile.h connection.h endpoint.h host.h innlistener.h \
-  tape.h
+  ../include/portable/stdbool.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/innconf.h ../include/inn/messages.h \
+  ../include/inn/network.h ../include/inn/version.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  article.h misc.h buffer.h configfile.h connection.h endpoint.h host.h \
+  innlistener.h tape.h
 imap_connection.o: imap_connection.c ../include/config.h \
   ../include/inn/defines.h ../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.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/messages.h ../include/inn/libinn.h \
-  ../include/inn/defines.h ../include/inn/xmalloc.h \
-  ../include/inn/xwrite.h buffer.h misc.h connection.h endpoint.h host.h \
-  innfeed.h ../include/inn/timer.h article.h configfile.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/messages.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h buffer.h misc.h \
+  connection.h endpoint.h host.h innfeed.h ../include/inn/timer.h \
+  article.h configfile.h
 innlistener.o: innlistener.c innfeed.h ../include/inn/timer.h \
   ../include/inn/defines.h ../include/inn/system.h ../include/inn/macros.h \
   ../include/portable/macros.h ../include/portable/stdbool.h \
   ../include/config.h ../include/inn/defines.h ../include/inn/options.h \
   ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/portable/stdbool.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h \
   ../include/inn/messages.h ../include/inn/nntp.h article.h misc.h \
   buffer.h configfile.h endpoint.h host.h innlistener.h tape.h
 main.o: main.c innfeed.h ../include/inn/timer.h ../include/inn/defines.h \
@@ -183,11 +188,11 @@
   ../include/portable/macros.h ../include/portable/stdbool.h \
   ../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/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/portable/stdbool.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.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
@@ -196,14 +201,15 @@
   ../include/portable/macros.h ../include/portable/stdbool.h \
   ../include/config.h ../include/inn/defines.h ../include/inn/options.h \
   ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
-  ../include/inn/messages.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h endpoint.h misc.h \
-  tape.h
+  ../include/portable/stdbool.h ../include/inn/messages.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  endpoint.h misc.h tape.h
 tape.o: tape.c innfeed.h ../include/inn/timer.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/macros.h \
   ../include/portable/macros.h ../include/portable/stdbool.h \
   ../include/config.h ../include/inn/defines.h ../include/inn/options.h \
   ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
-  ../include/inn/innconf.h ../include/inn/messages.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
-  article.h misc.h configfile.h endpoint.h tape.h
+  ../include/portable/stdbool.h ../include/inn/innconf.h \
+  ../include/inn/messages.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h article.h misc.h \
+  configfile.h endpoint.h tape.h

Modified: lib/Makefile
===================================================================
--- lib/Makefile	2014-12-07 18:33:37 UTC (rev 9762)
+++ lib/Makefile	2014-12-07 20:39:49 UTC (rev 9763)
@@ -99,40 +99,44 @@
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h
 buffer.o: buffer.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/buffer.h ../include/inn/xmalloc.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/buffer.h ../include/inn/xmalloc.h
 cleanfrom.o: cleanfrom.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h
 clientactive.o: clientactive.c ../include/config.h \
   ../include/inn/defines.h ../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/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/portable/stdbool.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
 clientlib.o: clientlib.c ../include/config.h ../include/inn/defines.h \
   ../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/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/macros.h ../include/portable/stdbool.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
 commands.o: commands.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h
 concat.o: concat.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/macros.h \
@@ -144,37 +148,41 @@
   ../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/conffile.h ../include/inn/libinn.h \
-  ../include/inn/defines.h ../include/inn/xmalloc.h \
-  ../include/inn/xwrite.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/conffile.h ../include/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h
 confparse.o: confparse.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/confparse.h \
-  ../include/inn/defines.h ../include/inn/hashtab.h \
-  ../include/inn/messages.h ../include/inn/vector.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/confparse.h ../include/inn/defines.h \
+  ../include/inn/hashtab.h ../include/inn/messages.h \
+  ../include/inn/vector.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
+  ../include/inn/xwrite.h
 daemonize.o: daemonize.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/messages.h \
-  ../include/inn/libinn.h ../include/inn/defines.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/messages.h ../include/inn/libinn.h \
+  ../include/inn/defines.h ../include/inn/xmalloc.h \
+  ../include/inn/xwrite.h
 date.o: date.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h
 dbz.o: dbz.c ../include/config.h ../include/inn/defines.h \
   ../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/mmap.h ../include/inn/dbz.h \
-  ../include/inn/libinn.h ../include/inn/defines.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/fdflag.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/mmap.h ../include/inn/dbz.h ../include/inn/libinn.h \
+  ../include/inn/defines.h ../include/inn/xmalloc.h \
+  ../include/inn/xwrite.h ../include/inn/fdflag.h \
   ../include/portable/socket.h ../include/portable/getaddrinfo.h \
   ../include/portable/getnameinfo.h ../include/inn/messages.h \
   ../include/inn/innconf.h ../include/inn/mmap.h
@@ -182,280 +190,306 @@
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/paths.h
 dispatch.o: dispatch.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/dispatch.h \
-  ../include/inn/vector.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/dispatch.h ../include/inn/vector.h
 fdflag.o: fdflag.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/fdflag.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/fdflag.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h
 fdlimit.o: fdlimit.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h
 getfqdn.o: getfqdn.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h
 getmodaddr.o: getmodaddr.c ../include/config.h ../include/inn/defines.h \
   ../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/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/portable/stdbool.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
 hash.o: hash.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/md5.h ../include/inn/defines.h \
-  ../include/inn/utility.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/md5.h ../include/inn/defines.h ../include/inn/utility.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h
 hashtab.o: hashtab.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/hashtab.h \
-  ../include/inn/defines.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/hashtab.h ../include/inn/defines.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h
 headers.o: headers.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h
 hex.o: hex.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/utility.h \
-  ../include/inn/defines.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/utility.h ../include/inn/defines.h
 innconf.o: innconf.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/confparse.h \
-  ../include/inn/defines.h ../include/inn/innconf.h \
-  ../include/inn/messages.h ../include/inn/vector.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
-  ../include/inn/paths.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/confparse.h ../include/inn/defines.h \
+  ../include/inn/innconf.h ../include/inn/messages.h \
+  ../include/inn/vector.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
+  ../include/inn/xwrite.h ../include/inn/paths.h
 inndcomm.o: inndcomm.c ../include/config.h ../include/inn/defines.h \
   ../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.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/portable/socket-unix.h ../include/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/inndcomm.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
-  ../include/inn/paths.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/portable/socket-unix.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/inndcomm.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h
 list.o: list.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/list.h ../include/inn/defines.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/list.h ../include/inn/defines.h
 localopen.o: localopen.c ../include/config.h ../include/inn/defines.h \
   ../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/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
+  ../include/inn/macros.h ../include/portable/stdbool.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 \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
-  ../include/inn/macros.h ../include/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h
 makedir.o: makedir.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h
 md5.o: md5.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/md5.h ../include/inn/defines.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/md5.h ../include/inn/defines.h
 messageid.o: messageid.c ../include/config.h ../include/inn/defines.h \
   ../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/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/macros.h ../include/portable/stdbool.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
 messages.o: messages.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/messages.h \
-  ../include/inn/xmalloc.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/messages.h ../include/inn/xmalloc.h
 mmap.o: mmap.c ../include/config.h ../include/inn/defines.h \
   ../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/mmap.h \
-  ../include/inn/messages.h ../include/inn/mmap.h ../include/inn/defines.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/mmap.h ../include/inn/messages.h \
+  ../include/inn/mmap.h ../include/inn/defines.h
 network.o: network.c ../include/config.h ../include/inn/defines.h \
   ../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.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/fdflag.h ../include/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h \
-  ../include/inn/network.h ../include/inn/xmalloc.h \
-  ../include/inn/xwrite.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/fdflag.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/network.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h
 network-innbind.o: network-innbind.c ../include/config.h \
   ../include/inn/defines.h ../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.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/innconf.h ../include/inn/defines.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.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/network.h \
   ../include/inn/network-innbind.h
 newsuser.o: newsuser.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h \
-  ../include/inn/newsuser.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/newsuser.h
 nntp.o: nntp.c ../include/config.h ../include/inn/defines.h \
   ../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.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/buffer.h ../include/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/network.h ../include/inn/nntp.h \
-  ../include/inn/vector.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
-  ../include/inn/xwrite.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/buffer.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/network.h ../include/inn/nntp.h ../include/inn/vector.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h
 numbers.o: numbers.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h
 qio.o: qio.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/qio.h ../include/inn/defines.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/qio.h ../include/inn/defines.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h
 radix32.o: radix32.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h
 readin.o: readin.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h
 remopen.o: remopen.c ../include/config.h ../include/inn/defines.h \
   ../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.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/innconf.h ../include/inn/defines.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h \
   ../include/inn/network.h ../include/inn/nntp.h
 reservedfd.o: reservedfd.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h
 resource.o: resource.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h
 sendarticle.o: sendarticle.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/nntp.h
 sendpass.o: sendpass.c ../include/config.h ../include/inn/defines.h \
   ../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/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/portable/stdbool.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
 sequence.o: sequence.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/sequence.h \
-  ../include/inn/defines.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/sequence.h ../include/inn/defines.h
 timer.o: timer.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/messages.h ../include/inn/timer.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/messages.h ../include/inn/timer.h \
   ../include/inn/defines.h ../include/inn/libinn.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h
 tst.o: tst.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/tst.h ../include/inn/defines.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/tst.h ../include/inn/defines.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h
 uwildmat.o: uwildmat.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h
 vector.o: vector.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/vector.h ../include/inn/xmalloc.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/vector.h ../include/inn/xmalloc.h
 wire.o: wire.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/wire.h ../include/inn/defines.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/wire.h ../include/inn/defines.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h
 xfopena.o: xfopena.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h
 xmalloc.o: xmalloc.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/messages.h \
-  ../include/inn/xmalloc.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/messages.h ../include/inn/xmalloc.h
 xsignal.o: xsignal.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/macros.h \
   ../include/portable/macros.h ../include/portable/stdbool.h \
@@ -466,8 +500,8 @@
   ../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/uio.h \
-  ../include/inn/xwrite.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/uio.h ../include/inn/xwrite.h
 alloca.o: alloca.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/macros.h \
   ../include/portable/macros.h ../include/portable/stdbool.h \
@@ -476,29 +510,31 @@
   ../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/inn/macros.h ../include/portable/stdbool.h
 fseeko.o: fseeko.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/macros.h ../include/portable/stdbool.h
 ftello.o: ftello.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/macros.h ../include/portable/stdbool.h
 getaddrinfo.o: getaddrinfo.c ../include/config.h ../include/inn/defines.h \
   ../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.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h
 getnameinfo.o: getnameinfo.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/macros.h \
   ../include/portable/macros.h ../include/portable/stdbool.h \
   ../include/inn/options.h ../include/portable/socket.h \
   ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/clibrary.h ../include/config.h ../include/inn/macros.h
+  ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
+  ../include/portable/stdbool.h
 getpagesize.o: getpagesize.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/macros.h \
   ../include/portable/macros.h ../include/portable/stdbool.h \
@@ -507,20 +543,23 @@
   ../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.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h
 inet_ntoa.o: inet_ntoa.c ../include/config.h ../include/inn/defines.h \
   ../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.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h
 inet_ntop.o: inet_ntop.c ../include/config.h ../include/inn/defines.h \
   ../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.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h
 memcmp.o: memcmp.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/macros.h \
   ../include/portable/macros.h ../include/portable/stdbool.h \
@@ -529,27 +568,27 @@
   ../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/inn/macros.h ../include/portable/stdbool.h
 pread.o: pread.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/macros.h ../include/portable/stdbool.h
 pwrite.o: pwrite.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/macros.h ../include/portable/stdbool.h
 reallocarray.o: reallocarray.c ../include/config.h \
   ../include/inn/defines.h ../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/inn/macros.h ../include/portable/stdbool.h
 setenv.o: setenv.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/macros.h ../include/portable/stdbool.h
 seteuid.o: seteuid.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/macros.h \
   ../include/portable/macros.h ../include/portable/stdbool.h \
@@ -558,8 +597,8 @@
   ../include/inn/defines.h ../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/setproctitle.h \
-  ../include/inn/messages.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/setproctitle.h ../include/inn/messages.h
 snprintf.o: snprintf.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/macros.h \
   ../include/portable/macros.h ../include/portable/stdbool.h \
@@ -568,27 +607,27 @@
   ../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/inn/macros.h ../include/portable/stdbool.h
 strlcat.o: strlcat.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/macros.h ../include/portable/stdbool.h
 strlcpy.o: strlcpy.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/macros.h ../include/portable/stdbool.h
 strspn.o: strspn.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/macros.h ../include/portable/stdbool.h
 strtok.o: strtok.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/macros.h ../include/portable/stdbool.h
 symlink.o: symlink.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/macros.h \
   ../include/portable/macros.h ../include/portable/stdbool.h \
@@ -597,6 +636,7 @@
   ../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/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h \
   ../include/ppport.h ../include/innperl.h

Modified: nnrpd/Makefile
===================================================================
--- nnrpd/Makefile	2014-12-07 18:33:37 UTC (rev 9762)
+++ nnrpd/Makefile	2014-12-07 20:39:49 UTC (rev 9763)
@@ -73,9 +73,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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h ../include/inn/wire.h \
-  nnrpd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/wire.h nnrpd.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
   ../include/portable/getnameinfo.h ../include/inn/qio.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 \
@@ -86,11 +87,11 @@
   ../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/inn/buffer.h \
-  ../include/inn/messages.h ../include/inn/vector.h nnrpd.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/inn/qio.h \
-  ../include/inn/defines.h ../include/inn/libinn.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/buffer.h ../include/inn/messages.h \
+  ../include/inn/vector.h nnrpd.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/qio.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/storage.h ../include/inn/options.h \
   ../include/inn/timer.h
@@ -98,29 +99,31 @@
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/tst.h ../include/inn/list.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
-  ../include/inn/storage.h ../include/inn/options.h cache.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h ../include/inn/tst.h \
+  ../include/inn/list.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
+  ../include/inn/xwrite.h ../include/inn/storage.h \
+  ../include/inn/options.h cache.h
 group.o: group.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/innconf.h \
-  ../include/inn/defines.h nnrpd.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/qio.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/vector.h ../include/inn/timer.h ../include/inn/ov.h \
-  ../include/inn/storage.h ../include/inn/history.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h nnrpd.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/qio.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/vector.h ../include/inn/timer.h \
+  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h
 commands.o: commands.c ../include/config.h ../include/inn/defines.h \
   ../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 nnrpd.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/qio.h ../include/inn/defines.h ../include/inn/libinn.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h nnrpd.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/qio.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/storage.h ../include/inn/options.h \
   ../include/inn/vector.h ../include/inn/timer.h ../include/inn/fdflag.h \
@@ -131,10 +134,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/inn/messages.h nnrpd.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/inn/qio.h \
-  ../include/inn/defines.h ../include/inn/libinn.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/messages.h nnrpd.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/qio.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/storage.h ../include/inn/options.h \
   ../include/inn/vector.h ../include/inn/timer.h tls.h
@@ -142,9 +145,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 nnrpd.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/qio.h ../include/inn/defines.h ../include/inn/libinn.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h nnrpd.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/qio.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/storage.h ../include/inn/options.h \
   ../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
@@ -154,21 +158,23 @@
   ../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/inn/innconf.h \
-  ../include/inn/defines.h nnrpd.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/qio.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/vector.h ../include/inn/timer.h tls.h ../include/inn/ov.h \
-  ../include/inn/storage.h ../include/inn/history.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h nnrpd.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/qio.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/vector.h ../include/inn/timer.h \
+  tls.h ../include/inn/ov.h ../include/inn/storage.h \
+  ../include/inn/history.h
 newnews.o: newnews.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h ../include/inn/wire.h \
-  nnrpd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/wire.h nnrpd.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
   ../include/portable/getnameinfo.h ../include/inn/qio.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 \
@@ -180,10 +186,11 @@
   ../include/portable/macros.h ../include/portable/stdbool.h \
   ../include/inn/options.h ../include/portable/alloca.h \
   ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
-  ../include/portable/setproctitle.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/innconf.h ../include/inn/defines.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/portable/stdbool.h ../include/portable/setproctitle.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.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/network.h \
   ../include/inn/network-innbind.h ../include/inn/newsuser.h \
   ../include/inn/ov.h ../include/inn/storage.h ../include/inn/options.h \
@@ -195,58 +202,60 @@
   ../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/inn/innconf.h \
-  ../include/inn/defines.h nnrpd.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/qio.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/vector.h ../include/inn/timer.h post.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h nnrpd.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/qio.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/vector.h ../include/inn/timer.h \
+  post.h \
   ../include/ppport.h ../include/innperl.h
 perm.o: perm.c ../include/config.h ../include/inn/defines.h \
   ../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/conffile.h ../include/inn/network.h \
-  ../include/inn/defines.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/innconf.h ../include/innperl.h nnrpd.h \
-  ../include/inn/qio.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/vector.h ../include/inn/timer.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/conffile.h ../include/inn/network.h ../include/inn/defines.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/innconf.h \
+  ../include/innperl.h nnrpd.h ../include/inn/qio.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/vector.h ../include/inn/timer.h
 post.o: post.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/innconf.h \
-  ../include/inn/defines.h nnrpd.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/qio.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/vector.h ../include/inn/timer.h ../include/inn/ov.h \
-  ../include/inn/storage.h ../include/inn/history.h post.h
-python.o: python.c ../include/config.h ../include/inn/defines.h \
-  ../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/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/innconf.h ../include/inn/defines.h nnrpd.h \
   ../include/portable/socket.h ../include/portable/getaddrinfo.h \
   ../include/portable/getnameinfo.h ../include/inn/qio.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/vector.h ../include/inn/timer.h \
-  ../include/inn/hashtab.h
+  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h \
+  post.h
+python.o: python.c ../include/config.h ../include/inn/defines.h \
+  ../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/stdbool.h ../include/inn/innconf.h \
+  ../include/inn/defines.h nnrpd.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/qio.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/vector.h ../include/inn/timer.h ../include/inn/hashtab.h
 sasl.o: sasl.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/messages.h nnrpd.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h ../include/inn/qio.h \
-  ../include/inn/defines.h ../include/inn/libinn.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/messages.h nnrpd.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/qio.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/storage.h ../include/inn/options.h \
   ../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
@@ -255,9 +264,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 nnrpd.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/qio.h ../include/inn/defines.h ../include/inn/libinn.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h nnrpd.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/qio.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/storage.h ../include/inn/options.h \
   ../include/inn/vector.h ../include/inn/timer.h ../include/inn/innconf.h \
@@ -266,10 +276,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/inn/innconf.h \
-  ../include/inn/defines.h nnrpd.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/qio.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/vector.h ../include/inn/timer.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h nnrpd.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/qio.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/vector.h ../include/inn/timer.h

Modified: storage/Makefile
===================================================================
--- storage/Makefile	2014-12-07 18:33:37 UTC (rev 9762)
+++ storage/Makefile	2014-12-07 20:39:49 UTC (rev 9763)
@@ -108,19 +108,20 @@
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/ov.h \
-  ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/options.h \
   ../include/inn/history.h ovinterface.h ../include/inn/storage.h \
   ../include/inn/paths.h ../include/inn/vector.h
 interface.o: interface.c ../include/config.h ../include/inn/defines.h \
   ../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/conffile.h ../include/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h ../include/inn/wire.h \
-  interface.h ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/conffile.h ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/wire.h interface.h \
+  ../include/inn/storage.h ../include/inn/options.h \
   ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
   methods.h ../include/inn/paths.h
 methods.o: methods.c interface.h ../include/config.h \
@@ -134,17 +135,19 @@
   ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h ../include/inn/wire.h \
-  ../include/inn/vector.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
-  ../include/inn/xwrite.h ../include/inn/ov.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/history.h ovinterface.h \
-  ../include/inn/storage.h ovmethods.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/wire.h ../include/inn/vector.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/history.h ovinterface.h ../include/inn/storage.h \
+  ovmethods.h
 overdata.o: overdata.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/buffer.h ../include/inn/innconf.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/buffer.h ../include/inn/innconf.h \
   ../include/inn/defines.h ../include/inn/messages.h ../include/inn/wire.h \
   ../include/inn/vector.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
   ../include/inn/xwrite.h ovinterface.h ../include/inn/history.h \
@@ -154,7 +157,8 @@
   ../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/inn/buffer.h ../include/inn/innconf.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/buffer.h ../include/inn/innconf.h \
   ../include/inn/defines.h ../include/inn/messages.h \
   ../include/inn/overview.h ../include/inn/storage.h \
   ../include/inn/options.h ../include/inn/wire.h ../include/inn/vector.h \
@@ -172,11 +176,11 @@
   ../include/inn/defines.h ../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/mmap.h \
-  ../include/inn/innconf.h ../include/inn/defines.h \
-  ../include/inn/messages.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/ov.h \
-  ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/mmap.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/messages.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/options.h \
   ../include/inn/history.h ../include/inn/paths.h ovinterface.h \
   ../include/inn/storage.h ../include/inn/fdflag.h \
   ../include/portable/socket.h ../include/portable/getaddrinfo.h \
@@ -186,29 +190,31 @@
   ../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/inn/messages.h \
-  ../include/inn/libinn.h ../include/inn/defines.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h buffindexed/shmem.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/messages.h ../include/inn/libinn.h \
+  ../include/inn/defines.h ../include/inn/xmalloc.h \
+  ../include/inn/xwrite.h buffindexed/shmem.h
 cnfs/cnfs.o: cnfs/cnfs.c ../include/config.h ../include/inn/defines.h \
   ../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/mmap.h \
-  ../include/inn/fdflag.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/innconf.h ../include/inn/defines.h \
-  ../include/inn/messages.h ../include/inn/mmap.h ../include/inn/wire.h \
-  interface.h ../include/inn/storage.h ../include/inn/options.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
-  methods.h interface.h ../include/inn/paths.h cnfs/cnfs.h \
-  cnfs/cnfs-private.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/mmap.h ../include/inn/fdflag.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/messages.h ../include/inn/mmap.h \
+  ../include/inn/wire.h interface.h ../include/inn/storage.h \
+  ../include/inn/options.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h methods.h interface.h \
+  ../include/inn/paths.h cnfs/cnfs.h cnfs/cnfs-private.h
 ovdb/ovdb.o: ovdb/ovdb.c ../include/config.h ../include/inn/defines.h \
   ../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.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/conffile.h ../include/inn/fdflag.h ../include/inn/innconf.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.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 \
@@ -220,74 +226,79 @@
   ../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/inn/messages.h \
-  ../include/inn/libinn.h ../include/inn/defines.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h timecaf/caf.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/messages.h ../include/inn/libinn.h \
+  ../include/inn/defines.h ../include/inn/xmalloc.h \
+  ../include/inn/xwrite.h timecaf/caf.h
 timecaf/timecaf.o: timecaf/timecaf.c ../include/config.h ../include/inn/defines.h \
   ../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/mmap.h timecaf/caf.h \
-  ../include/inn/fdflag.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/innconf.h ../include/inn/defines.h \
-  ../include/inn/messages.h ../include/inn/wire.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h methods.h interface.h \
-  ../include/inn/storage.h ../include/inn/options.h timecaf/timecaf.h \
-  interface.h ../include/inn/paths.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/mmap.h timecaf/caf.h ../include/inn/fdflag.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/messages.h ../include/inn/wire.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  methods.h interface.h ../include/inn/storage.h ../include/inn/options.h \
+  timecaf/timecaf.h interface.h ../include/inn/paths.h
 timehash/timehash.o: timehash/timehash.c ../include/config.h \
   ../include/inn/defines.h ../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/mmap.h \
-  ../include/inn/innconf.h ../include/inn/defines.h \
-  ../include/inn/messages.h ../include/inn/wire.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h methods.h interface.h \
-  ../include/inn/storage.h ../include/inn/options.h ../include/inn/paths.h \
-  timehash/timehash.h interface.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/mmap.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/messages.h ../include/inn/wire.h \
+  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  methods.h interface.h ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/paths.h timehash/timehash.h interface.h
 tradindexed/tdx-cache.o: tradindexed/tdx-cache.c ../include/config.h \
   ../include/inn/defines.h ../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/inn/hashtab.h \
-  ../include/inn/defines.h ../include/inn/messages.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/hashtab.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h \
   ../include/inn/storage.h ../include/inn/options.h \
   tradindexed/tdx-private.h
 tradindexed/tdx-data.o: tradindexed/tdx-data.c ../include/config.h \
   ../include/inn/defines.h ../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/mmap.h \
-  ../include/inn/fdflag.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/history.h ../include/inn/defines.h \
-  ../include/inn/innconf.h ../include/inn/messages.h ../include/inn/mmap.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
-  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/options.h \
-  ovinterface.h ../include/inn/storage.h tradindexed/tdx-private.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/mmap.h ../include/inn/fdflag.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/history.h \
+  ../include/inn/defines.h ../include/inn/innconf.h \
+  ../include/inn/messages.h ../include/inn/mmap.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/ov.h \
+  ../include/inn/storage.h ../include/inn/options.h ovinterface.h \
+  ../include/inn/storage.h tradindexed/tdx-private.h \
   tradindexed/tdx-structure.h
 tradindexed/tdx-group.o: tradindexed/tdx-group.c ../include/config.h \
   ../include/inn/defines.h ../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/mmap.h \
-  ../include/inn/fdflag.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/hashtab.h ../include/inn/defines.h \
-  ../include/inn/innconf.h ../include/inn/messages.h ../include/inn/mmap.h \
-  ../include/inn/qio.h ../include/inn/vector.h ../include/inn/libinn.h \
-  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h \
-  tradindexed/tdx-private.h ../include/inn/storage.h \
-  ../include/inn/options.h tradindexed/tdx-structure.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/mmap.h ../include/inn/fdflag.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/hashtab.h \
+  ../include/inn/defines.h ../include/inn/innconf.h \
+  ../include/inn/messages.h ../include/inn/mmap.h ../include/inn/qio.h \
+  ../include/inn/vector.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
+  ../include/inn/xwrite.h ../include/inn/paths.h tradindexed/tdx-private.h \
+  ../include/inn/storage.h ../include/inn/options.h \
+  tradindexed/tdx-structure.h
 tradindexed/tradindexed.o: tradindexed/tradindexed.c ../include/config.h \
   ../include/inn/defines.h ../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/inn/innconf.h \
-  ../include/inn/defines.h ../include/inn/messages.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
-  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/options.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/innconf.h ../include/inn/defines.h \
+  ../include/inn/messages.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/ov.h \
+  ../include/inn/storage.h ../include/inn/options.h \
   ../include/inn/history.h ../include/inn/storage.h \
   tradindexed/tdx-private.h tradindexed/tdx-structure.h \
   tradindexed/tradindexed.h
@@ -295,17 +306,19 @@
   ../include/inn/defines.h ../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/mmap.h \
-  ../include/inn/innconf.h ../include/inn/defines.h \
-  ../include/inn/messages.h ../include/inn/qio.h ../include/inn/wire.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
-  ../include/inn/paths.h methods.h interface.h ../include/inn/storage.h \
-  ../include/inn/options.h tradspool/tradspool.h interface.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/portable/mmap.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/messages.h ../include/inn/qio.h \
+  ../include/inn/wire.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
+  ../include/inn/xwrite.h ../include/inn/paths.h methods.h interface.h \
+  ../include/inn/storage.h ../include/inn/options.h tradspool/tradspool.h \
+  interface.h
 trash/trash.o: trash/trash.c ../include/config.h ../include/inn/defines.h \
   ../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/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/libinn.h ../include/inn/defines.h \
   ../include/inn/xmalloc.h ../include/inn/xwrite.h methods.h interface.h \
   ../include/inn/storage.h ../include/inn/options.h trash/trash.h \
   interface.h
@@ -313,11 +326,12 @@
   ../include/inn/defines.h ../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/inn/buffer.h ../include/inn/libinn.h \
-  ../include/inn/defines.h ../include/inn/xmalloc.h \
-  ../include/inn/xwrite.h ../include/inn/history.h \
-  ../include/inn/innconf.h ../include/inn/messages.h \
-  ../include/inn/newsuser.h ../include/inn/ov.h ../include/inn/storage.h \
-  ../include/inn/options.h ../include/inn/paths.h ../include/inn/vector.h \
-  ../include/inn/wire.h ovinterface.h ../include/inn/storage.h \
-  tradindexed/tdx-private.h tradindexed/tdx-structure.h
+  ../include/inn/macros.h ../include/portable/stdbool.h \
+  ../include/inn/buffer.h ../include/inn/libinn.h ../include/inn/defines.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/history.h ../include/inn/innconf.h \
+  ../include/inn/messages.h ../include/inn/newsuser.h ../include/inn/ov.h \
+  ../include/inn/storage.h ../include/inn/options.h ../include/inn/paths.h \
+  ../include/inn/vector.h ../include/inn/wire.h ovinterface.h \
+  ../include/inn/storage.h tradindexed/tdx-private.h \
+  tradindexed/tdx-structure.h

Modified: support/getrra-c-util
===================================================================
--- support/getrra-c-util	2014-12-07 18:33:37 UTC (rev 9762)
+++ support/getrra-c-util	2014-12-07 20:39:49 UTC (rev 9763)
@@ -54,7 +54,7 @@
 dnl $Id$' \
              ${TEMP}
     elif [ "$2" = "include/inn" ] || [ "$2" = "include/portable" ] \
-      || [ "$2" = "lib" ] || [ "$2" = "tests/lib" ] \
+      || [ "$2" = "include" ] || [ "$2" = "lib" ] || [ "$2" = "tests/lib" ] \
       || [ "$2" = "tests/lib/network" ] || [ "$2" = "tests/tap" ]
     then
       if [ "$3" = "xmalloc.t" ]
@@ -92,6 +92,73 @@
                ${TEMP}
         fi
 
+        if [ "$3" = "clibrary.h" ]
+        then
+          # Add INN-specific stuff.
+          sed -i -e 's/<portable\/macros\.h>/"inn\/macros.h"/g' \
+                 -e 's/PORTABLE_SYSTEM_H/CLIBRARY_H/g' \
+                 -e "8 i \\
+ *     #include \"inn/macros.h\"" \
+                 -e "101 i \\
+/*\\
+ * This almost certainly isn't necessary, but it's not hurting anything.\\
+ * gcc assumes that if SEEK_SET isn't defined none of the rest are either,\\
+ * so we certainly can as well.\\
+ */\\
+#ifndef SEEK_SET\\
+# define SEEK_SET 0\\
+# define SEEK_CUR 1\\
+# define SEEK_END 2\\
+#endif\\
+" \
+                 -e "115 i \\
+/*\\
+ * Handle defining fseeko and ftello.  If HAVE_FSEEKO is defined, the system\\
+ * header files take care of this for us.  Otherwise, see if we're building\\
+ * with large file support.  If we are, we have to provide some real fseeko\\
+ * and ftello implementation; declare them if they're not already declared and\\
+ * we'll use replacement versions in libinn.  If we're not using large files,\\
+ * we can safely just use fseek and ftell.\\
+ *\\
+ * We'd rather use fseeko and ftello unconditionally, even when we're not\\
+ * building with large file support, since they're a better interface.\\
+ * Unfortunately, they're available but not declared on some systems unless\\
+ * building with large file support, the AC_FUNC_FSEEKO Autoconf function\\
+ * always turns on large file support, and our fake declarations won't work on\\
+ * some systems (like HP_UX).  This is the best compromise we've been able to\\
+ * come up with.\\
+ */\\
+#if !HAVE_FSEEKO\\
+# if DO_LARGEFILES\\
+#  if !HAVE_DECL_FSEEKO\\
+extern int fseeko(FILE *, off_t, int);\\
+#  endif\\
+#  if !HAVE_DECL_FTELLO\\
+extern off_t ftello(FILE *);\\
+#  endif\\
+# else\\
+#  define fseeko(f, o, w) fseek((f), (long)(o), (w))\\
+#  define ftello(f) ftell(f)\\
+# endif\\
+#endif\\
+\\
+/* Other prototypes. */\\
+#if !HAVE_DECL_PREAD\\
+extern ssize_t pread(int, void *, size_t, off_t);\\
+#endif\\
+#if !HAVE_DECL_PWRITE\\
+extern ssize_t pwrite(int, const void *, size_t, off_t);\\
+#endif\\
+#if !HAVE_SYMLINK\\
+extern int symlink(const char *, const char *);\\
+#endif\\
+" \
+               -e '/#if !HAVE_DAEMON/,+2d' \
+               -e '/#if !HAVE_ISSETUGID/,+2d' \
+               -e '/#if !HAVE_STRNDUP/,+2d' \
+               ${TEMP}
+        fi
+
         sed -i -e 's/UTIL_/INN_/g' \
                -e '/^\/\* Default to a hidden visibility for all .* functions\. \*\/$/,+2d' \
                -e '/^\/\* Undo default visibility change\. \*\/$/,+2d' \
@@ -171,6 +238,7 @@
 download portable/stdbool.h include/portable stdbool.h
 download portable/strlcat.c lib strlcat.c
 download portable/strlcpy.c lib strlcpy.c
+download portable/system.h include clibrary.h
 download portable/uio.h include/portable uio.h
 
 ##  Synchronize utility functions from upstream.

