INN commit: trunk (10 files)

[INN Commit]

    Date: Wednesday, January 7, 2015 @ 12:50:58
  Author: iulius
Revision: 9779

Update dependencies

Modified:
  trunk/authprogs/Makefile
  trunk/backends/Makefile
  trunk/expire/Makefile
  trunk/frontends/Makefile
  trunk/history/Makefile
  trunk/innd/Makefile
  trunk/innfeed/Makefile
  trunk/lib/Makefile
  trunk/nnrpd/Makefile
  trunk/storage/Makefile

--------------------+
 authprogs/Makefile |   47 +++++----
 backends/Makefile  |   79 ++++++++--------
 expire/Makefile    |   16 +--
 frontends/Makefile |   49 +++++----
 history/Makefile   |   15 +--
 innd/Makefile      |  234 ++++++++++++++++++++++++-----------------------
 innfeed/Makefile   |   81 ++++++++--------
 lib/Makefile       |  251 ++++++++++++++++++++++++++-------------------------
 nnrpd/Makefile     |  208 +++++++++++++++++++++---------------------
 storage/Makefile   |   69 +++++++-------
 10 files changed, 546 insertions(+), 503 deletions(-)

Modified: authprogs/Makefile
===================================================================
--- authprogs/Makefile	2015-01-07 20:50:16 UTC (rev 9778)
+++ authprogs/Makefile	2015-01-07 20:50:58 UTC (rev 9779)
@@ -77,58 +77,61 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 auth_krb5.o: auth_krb5.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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
+  ../include/portable/socket.h ../include/portable/macros.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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
+  ../include/portable/macros.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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
+  ../include/portable/macros.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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
+  ../include/inn/defines.h ../include/inn/portable-socket.h \
+  ../include/inn/portable-getaddrinfo.h \
+  ../include/inn/portable-getnameinfo.h ../include/inn/libinn.h \
+  ../include/inn/xmalloc.h ../include/inn/xwrite.h libauth.h \
+  ../include/portable/socket.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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
+  ../include/portable/socket.h ../include/portable/macros.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/portable-macros.h ../include/inn/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/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
+  ../include/portable/socket.h ../include/portable/macros.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h

Modified: backends/Makefile
===================================================================
--- backends/Makefile	2015-01-07 20:50:16 UTC (rev 9778)
+++ backends/Makefile	2015-01-07 20:50:58 UTC (rev 9779)
@@ -124,7 +124,7 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 actsync.o: actsync.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/portable-macros.h ../include/inn/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 \
@@ -133,7 +133,7 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/buffer.h ../include/inn/innconf.h \
@@ -143,7 +143,7 @@
   ../include/inn/storage.h ../include/inn/options.h
 batcher.o: batcher.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/portable-macros.h ../include/inn/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 \
@@ -152,7 +152,7 @@
   ../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/portable-macros.h ../include/inn/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 \
@@ -161,7 +161,7 @@
   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/portable-macros.h ../include/inn/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 \
@@ -170,7 +170,7 @@
   ../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/portable-macros.h ../include/inn/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 \
@@ -179,17 +179,18 @@
   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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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
+  ../include/portable/socket.h ../include/portable/macros.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/portable-macros.h ../include/inn/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 \
@@ -199,29 +200,29 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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
+  ../include/portable/socket.h ../include/portable/macros.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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
+  ../include/portable/socket.h ../include/portable/macros.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/libinn.h ../include/inn/defines.h \
@@ -229,23 +230,23 @@
   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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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
+  ../include/portable/socket.h ../include/portable/macros.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/portable-macros.h ../include/inn/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 \
@@ -255,13 +256,13 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/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 \

Modified: expire/Makefile
===================================================================
--- expire/Makefile	2015-01-07 20:50:16 UTC (rev 9778)
+++ expire/Makefile	2015-01-07 20:50:58 UTC (rev 9779)
@@ -84,7 +84,7 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 convdate.o: convdate.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/messages.h ../include/inn/libinn.h \
@@ -92,7 +92,7 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/history.h ../include/inn/defines.h \
@@ -103,7 +103,7 @@
   ../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/portable-macros.h ../include/inn/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 \
@@ -114,7 +114,7 @@
   ../include/inn/storage.h
 fastrm.o: fastrm.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/portable-macros.h ../include/inn/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 \
@@ -123,7 +123,7 @@
   ../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/inn/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/config.h ../include/inn/options.h ../include/inn/macros.h \
   ../include/portable/stdbool.h ../include/inn/history.h \
   ../include/inn/defines.h ../include/inn/innconf.h \
@@ -132,7 +132,7 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/dbz.h ../include/inn/libinn.h ../include/inn/defines.h \
@@ -142,7 +142,7 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/buffer.h ../include/inn/history.h \
@@ -154,7 +154,7 @@
   ../include/inn/wire.h
 prunehistory.o: prunehistory.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/history.h ../include/inn/defines.h \

Modified: frontends/Makefile
===================================================================
--- frontends/Makefile	2015-01-07 20:50:16 UTC (rev 9778)
+++ frontends/Makefile	2015-01-07 20:50:58 UTC (rev 9779)
@@ -133,7 +133,7 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 ctlinnd.o: ctlinnd.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/portable-macros.h ../include/inn/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 \
@@ -142,18 +142,18 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/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 \
@@ -162,7 +162,7 @@
   ../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/portable-macros.h ../include/inn/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 \
@@ -171,7 +171,7 @@
   ../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/portable-macros.h ../include/inn/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 \
@@ -179,7 +179,7 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/libinn.h ../include/inn/defines.h \
@@ -190,24 +190,26 @@
   ../storage/ovdb/ovdb-private.h
 ovdb_monitor.o: ovdb_monitor.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable/setproctitle.h ../include/portable/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/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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable/macros.h ../include/portable/socket.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/portable/socket-unix.h ../include/inn/fdflag.h \
+  ../include/inn/portable-socket.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 \
@@ -215,7 +217,7 @@
   ../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/portable-macros.h ../include/inn/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 \
@@ -226,19 +228,20 @@
   ../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/portable-macros.h ../include/inn/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/innconf.h ../include/inn/defines.h \
-  ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+  ../include/inn/fdflag.h ../include/inn/portable-socket.h \
+  ../include/inn/portable-getaddrinfo.h \
+  ../include/inn/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
 sm.o: sm.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/buffer.h ../include/inn/innconf.h \

Modified: history/Makefile
===================================================================
--- history/Makefile	2015-01-07 20:50:16 UTC (rev 9778)
+++ history/Makefile	2015-01-07 20:50:58 UTC (rev 9779)
@@ -100,7 +100,7 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 his.o: his.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/history.h ../include/inn/defines.h \
@@ -110,18 +110,19 @@
   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 \
+  ../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h hismethods.h hisv6/hisv6.h
 hisv6/hisv6.o: hisv6/hisv6.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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
+  ../include/inn/fdflag.h ../include/inn/portable-socket.h \
+  ../include/inn/portable-getaddrinfo.h \
+  ../include/inn/portable-getnameinfo.h ../include/inn/innconf.h \
+  ../include/inn/timer.h ../include/inn/qio.h ../include/inn/sequence.h \
+  ../include/inn/inndcomm.h

Modified: innd/Makefile
===================================================================
--- innd/Makefile	2015-01-07 20:50:16 UTC (rev 9778)
+++ innd/Makefile	2015-01-07 20:50:58 UTC (rev 9779)
@@ -71,11 +71,12 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 art.o: art.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/portable-macros.h ../include/inn/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/md5.h \
-  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/options.h \
+  ../include/portable/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/history.h ../include/inn/storage.h \
   ../include/inn/vector.h ../include/inn/wire.h innd.h \
   ../include/portable/socket.h ../include/portable/getaddrinfo.h \
@@ -85,40 +86,42 @@
   ../include/inn/paths.h
 cc.o: cc.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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 \
-  ../include/inn/xwrite.h ../include/inn/nntp.h ../include/inn/paths.h \
-  ../include/inn/storage.h ../include/inn/options.h \
+  ../include/portable/macros.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/inndcomm.h ../include/innperl.h
 chan.o: chan.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/portable-macros.h ../include/inn/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/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/fdflag.h ../include/inn/portable-socket.h \
+  ../include/inn/portable-getaddrinfo.h \
+  ../include/inn/portable-getnameinfo.h ../include/inn/innconf.h \
+  ../include/inn/defines.h ../include/inn/network.h innd.h \
+  ../include/portable/macros.h ../include/portable/socket.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-socket.h ../include/inn/portable-getaddrinfo.h \
+  ../include/inn/portable-getnameinfo.h ../include/inn/innconf.h \
   ../include/inn/defines.h ../include/inn/mmap.h innd.h \
+  ../include/portable/macros.h ../include/portable/socket.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 \
@@ -126,123 +129,127 @@
   ../include/inn/ov.h ../include/inn/storage.h
 innd.o: innd.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/portable-macros.h ../include/inn/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/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 \
-  ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
-  ../include/inn/ov.h ../include/inn/storage.h
+  innd.h ../include/portable/macros.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 ../include/inn/paths.h ../include/inn/storage.h \
+  ../include/inn/options.h ../include/inn/ov.h ../include/inn/storage.h
 keywords.o: keywords.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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 \
-  ../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
-lc.o: lc.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 innd.h \
+  ../include/inn/innconf.h innd.h ../include/portable/macros.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/timer.h ../include/inn/nntp.h ../include/inn/paths.h \
+  ../include/inn/storage.h ../include/inn/options.h
+lc.o: lc.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/portable-macros.h ../include/inn/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/inn/innconf.h ../include/inn/defines.h innd.h \
+  ../include/portable/macros.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/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/portable-macros.h ../include/inn/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 innd.h \
+  ../include/inn/innconf.h ../include/inn/defines.h ../include/inn/qio.h \
+  ../include/inn/version.h innd.h ../include/portable/macros.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/inn/portable-macros.h ../include/inn/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 innd.h \
+  ../include/portable/macros.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/portable-macros.h ../include/inn/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 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/portable/macros.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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 \
-  ../include/inn/xwrite.h ../include/inn/nntp.h ../include/inn/paths.h \
-  ../include/inn/storage.h ../include/inn/options.h \
+  ../include/portable/macros.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/ppport.h ../include/innperl.h
 proc.o: proc.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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
+  ../include/portable/macros.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/portable-macros.h ../include/inn/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/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 \
-  ../include/inn/xwrite.h ../include/inn/nntp.h ../include/inn/paths.h \
-  ../include/inn/storage.h ../include/inn/options.h
+  ../include/portable/macros.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
 rc.o: rc.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable/socket.h ../include/portable/macros.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/fdflag.h ../include/inn/portable-socket.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 \
@@ -252,24 +259,27 @@
   ../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/portable-macros.h ../include/inn/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/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
+  ../include/inn/fdflag.h ../include/inn/portable-socket.h \
+  ../include/inn/portable-getaddrinfo.h \
+  ../include/inn/portable-getnameinfo.h ../include/inn/innconf.h \
+  ../include/inn/defines.h innd.h ../include/portable/macros.h \
+  ../include/portable/socket.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/system.h ../include/inn/macros.h \
-  ../include/portable/macros.h ../include/portable/stdbool.h \
+  ../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.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/portable/socket.h ../include/portable/macros.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/network.h ../include/inn/defines.h \
+  ../include/inn/portable-socket.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 \
@@ -277,31 +287,33 @@
   ../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/portable-macros.h ../include/inn/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/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/fdflag.h ../include/inn/portable-socket.h \
+  ../include/inn/portable-getaddrinfo.h \
+  ../include/inn/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/portable/macros.h ../include/portable/socket.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/portable-macros.h ../include/inn/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 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/macros.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/dispatch.h ../include/inn/messages.h ../include/inn/md5.h \

Modified: innfeed/Makefile
===================================================================
--- innfeed/Makefile	2015-01-07 20:50:16 UTC (rev 9778)
+++ innfeed/Makefile	2015-01-07 20:50:58 UTC (rev 9779)
@@ -100,116 +100,121 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 article.o: article.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/inn/portable-macros.h ../include/inn/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/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
+  ../include/portable/macros.h buffer.h endpoint.h
 buffer.o: buffer.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/inn/portable-macros.h ../include/inn/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/stdbool.h ../include/inn/messages.h \
   ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
-  buffer.h misc.h
+  buffer.h misc.h ../include/portable/macros.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 \
+  ../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/config.h ../include/inn/defines.h ../include/inn/options.h \
   ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
-  configfile.h config_y.h misc.h
+  configfile.h config_y.h misc.h ../include/portable/macros.h
 config_y.o: config_y.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/inn/portable-macros.h ../include/inn/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/stdbool.h ../include/inn/messages.h \
   ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
-  configfile.h misc.h
+  configfile.h misc.h ../include/portable/macros.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/inn/portable-macros.h ../include/inn/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/stdbool.h ../include/portable/socket.h \
-  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
-  ../include/inn/fdflag.h ../include/inn/innconf.h \
+  ../include/portable/macros.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/fdflag.h \
+  ../include/inn/portable-socket.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/inn/portable-macros.h ../include/inn/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/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
+  ../include/portable/macros.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/inn/portable-macros.h ../include/inn/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/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/portable/macros.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/innconf.h \
+  ../include/inn/messages.h ../include/inn/network.h \
+  ../include/inn/portable-socket.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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
+  ../include/portable/socket.h ../include/portable/macros.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/inn/portable-macros.h ../include/inn/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/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
+  ../include/portable/macros.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 \
   ../include/inn/system.h ../include/inn/macros.h \
-  ../include/portable/macros.h ../include/portable/stdbool.h \
+  ../include/inn/portable-macros.h ../include/inn/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/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/portable/macros.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
 misc.o: misc.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/inn/portable-macros.h ../include/inn/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/stdbool.h ../include/inn/messages.h \
   ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
-  endpoint.h misc.h tape.h
+  endpoint.h misc.h ../include/portable/macros.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/inn/portable-macros.h ../include/inn/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/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
+  ../include/portable/macros.h configfile.h endpoint.h tape.h

Modified: lib/Makefile
===================================================================
--- lib/Makefile	2015-01-07 20:50:16 UTC (rev 9778)
+++ lib/Makefile	2015-01-07 20:50:58 UTC (rev 9779)
@@ -97,27 +97,27 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 argparse.o: argparse.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/portable-macros.h ../include/inn/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/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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/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 \
@@ -125,7 +125,7 @@
   ../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/portable-macros.h ../include/inn/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 \
@@ -133,27 +133,27 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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 \
-  ../include/portable/macros.h ../include/portable/stdbool.h \
+  ../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/inn/libinn.h \
   ../include/inn/defines.h ../include/inn/xmalloc.h \
   ../include/inn/xwrite.h
 conffile.o: conffile.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/confparse.h ../include/inn/defines.h \
@@ -162,7 +162,7 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/messages.h ../include/inn/libinn.h \
@@ -170,25 +170,25 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-socket.h ../include/inn/portable-getaddrinfo.h \
+  ../include/inn/portable-getnameinfo.h ../include/inn/messages.h \
   ../include/inn/innconf.h ../include/inn/mmap.h
 defdist.o: defdist.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/portable-macros.h ../include/inn/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 \
@@ -196,34 +196,35 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/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/portable-socket.h \
+  ../include/inn/portable-getaddrinfo.h \
+  ../include/inn/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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/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 \
@@ -231,34 +232,34 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/confparse.h ../include/inn/defines.h \
@@ -267,23 +268,24 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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
+  ../include/portable/socket.h ../include/portable/macros.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/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 \
@@ -292,27 +294,27 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/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 \
@@ -320,117 +322,121 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable/socket.h ../include/portable/macros.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/inn/fdflag.h ../include/inn/portable-socket.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable/socket.h ../include/portable/macros.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/portable-socket.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/portable-macros.h ../include/inn/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/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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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
+  ../include/portable/socket.h ../include/portable/macros.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/portable-socket.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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
+  ../include/portable/socket.h ../include/portable/macros.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/portable-socket.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/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 \
@@ -438,13 +444,13 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/messages.h ../include/inn/timer.h \
@@ -452,189 +458,192 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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 \
+  ../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/inn/libinn.h \
   ../include/inn/defines.h ../include/inn/xmalloc.h \
   ../include/inn/xwrite.h
 xwrite.o: xwrite.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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 \
+  ../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h
 asprintf.o: asprintf.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/portable-macros.h ../include/inn/portable-stdbool.h \
+  ../include/inn/options.h ../include/portable/macros.h \
+  ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h
+  ../include/portable/socket.h ../include/portable/macros.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/inn/portable-macros.h ../include/inn/portable-stdbool.h \
+  ../include/inn/options.h ../include/portable/macros.h \
+  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.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 \
+  ../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h
 inet_aton.o: inet_aton.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h
+  ../include/portable/socket.h ../include/portable/macros.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h
+  ../include/portable/socket.h ../include/portable/macros.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
-  ../include/portable/socket.h ../include/portable/getaddrinfo.h \
-  ../include/portable/getnameinfo.h
+  ../include/portable/socket.h ../include/portable/macros.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 \
+  ../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h
 mkstemp.o: mkstemp.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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 \
+  ../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h
 setproctitle.o: setproctitle.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
-  ../include/portable/setproctitle.h ../include/inn/messages.h
+  ../include/portable/setproctitle.h ../include/portable/macros.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 \
+  ../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h
 strcasecmp.o: strcasecmp.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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 \
+  ../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/libinn.h ../include/inn/defines.h \

Modified: nnrpd/Makefile
===================================================================
--- nnrpd/Makefile	2015-01-07 20:50:16 UTC (rev 9778)
+++ nnrpd/Makefile	2015-01-07 20:50:58 UTC (rev 9779)
@@ -71,33 +71,34 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 article.o: article.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/portable-macros.h ../include/inn/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/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 \
-  ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
-  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h \
-  tls.h cache.h
+  ../include/portable/macros.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 tls.h cache.h
 auth-ext.o: auth-ext.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/vector.h nnrpd.h ../include/portable/macros.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
 cache.o: 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/portable-macros.h ../include/inn/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/tst.h \
@@ -106,49 +107,52 @@
   ../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/portable-macros.h ../include/inn/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/ov.h ../include/inn/storage.h ../include/inn/history.h
+  ../include/portable/macros.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable/macros.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 \
-  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h \
+  ../include/inn/portable-socket.h ../include/inn/ov.h \
+  ../include/inn/storage.h ../include/inn/history.h \
   ../include/inn/innconf.h ../include/inn/messages.h \
   ../include/inn/version.h tls.h
 line.o: line.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/messages.h nnrpd.h ../include/portable/macros.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
 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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable/macros.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 \
@@ -156,130 +160,134 @@
   ../include/inn/innconf.h ../include/inn/messages.h
 misc.o: misc.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/portable-macros.h ../include/inn/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 \
-  tls.h ../include/inn/ov.h ../include/inn/storage.h \
-  ../include/inn/history.h
+  ../include/portable/macros.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/portable-macros.h ../include/inn/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/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 \
-  ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
-  ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h \
-  cache.h
+  ../include/portable/macros.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 cache.h
 nnrpd.o: nnrpd.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/portable/alloca.h \
   ../include/clibrary.h ../include/config.h ../include/inn/macros.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/portable/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/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 \
-  ../include/inn/history.h ../include/inn/version.h nnrpd.h \
-  ../include/inn/qio.h ../include/inn/nntp.h ../include/inn/paths.h \
-  ../include/inn/storage.h ../include/inn/vector.h ../include/inn/timer.h \
-  tls.h
+  ../include/inn/portable-socket.h ../include/inn/network-innbind.h \
+  ../include/inn/newsuser.h ../include/inn/ov.h ../include/inn/storage.h \
+  ../include/inn/options.h ../include/inn/history.h \
+  ../include/inn/version.h nnrpd.h ../include/inn/qio.h \
+  ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+  ../include/inn/vector.h ../include/inn/timer.h tls.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/portable-macros.h ../include/inn/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 \
-  post.h \
+  ../include/portable/macros.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-socket.h ../include/inn/portable-getaddrinfo.h \
+  ../include/inn/portable-getnameinfo.h ../include/inn/innconf.h \
+  ../include/innperl.h nnrpd.h ../include/portable/macros.h \
+  ../include/portable/socket.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/portable-macros.h ../include/inn/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/macros.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/inn/portable-macros.h ../include/inn/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/macros.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/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/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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/messages.h nnrpd.h ../include/portable/macros.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 \
   ../include/inn/storage.h ../include/inn/history.h
 tls.o: tls.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable/macros.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 \
   tls.h
 track.o: track.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/portable-macros.h ../include/inn/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/portable/macros.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	2015-01-07 20:50:16 UTC (rev 9778)
+++ storage/Makefile	2015-01-07 20:50:58 UTC (rev 9779)
@@ -106,7 +106,7 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 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/portable-macros.h ../include/inn/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 \
@@ -116,7 +116,7 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/conffile.h ../include/inn/innconf.h ../include/inn/defines.h \
@@ -126,14 +126,14 @@
   methods.h ../include/inn/paths.h
 methods.o: methods.c interface.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/inn/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/inn/storage.h \
   ../include/inn/defines.h ../include/inn/options.h methods.h cnfs/cnfs.h \
   timecaf/timecaf.h interface.h timehash/timehash.h tradspool/tradspool.h \
   trash/trash.h
 ov.o: ov.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/portable-macros.h ../include/inn/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 \
@@ -144,7 +144,7 @@
   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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/buffer.h ../include/inn/innconf.h \
@@ -155,7 +155,7 @@
   ../include/inn/storage.h
 overview.o: overview.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/buffer.h ../include/inn/innconf.h \
@@ -167,14 +167,14 @@
   ovinterface.h ovmethods.h
 ovmethods.o: ovmethods.c ovinterface.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/inn/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/inn/history.h \
   ../include/inn/defines.h ../include/inn/ov.h ../include/inn/storage.h \
   ../include/inn/options.h ../include/inn/storage.h \
   buffindexed/buffindexed.h ovdb/ovdb.h tradindexed/tradindexed.h
 buffindexed/buffindexed.o: buffindexed/buffindexed.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/portable/mmap.h ../include/inn/innconf.h \
@@ -183,12 +183,12 @@
   ../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 \
-  ../include/portable/getnameinfo.h buffindexed/shmem.h \
+  ../include/inn/portable-socket.h ../include/inn/portable-getaddrinfo.h \
+  ../include/inn/portable-getnameinfo.h buffindexed/shmem.h \
   buffindexed/buffindexed.h
 buffindexed/shmem.o: buffindexed/shmem.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/messages.h ../include/inn/libinn.h \
@@ -196,12 +196,12 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-socket.h ../include/inn/portable-getaddrinfo.h \
+  ../include/inn/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 \
@@ -209,12 +209,13 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable/socket.h ../include/portable/macros.h \
+  ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+  ../include/conffile.h ../include/inn/fdflag.h \
+  ../include/inn/portable-socket.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 \
@@ -224,7 +225,7 @@
   ../include/portable/socket-unix.h
 timecaf/caf.o: timecaf/caf.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/macros.h \
-  ../include/portable/macros.h ../include/portable/stdbool.h \
+  ../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/messages.h ../include/inn/libinn.h \
@@ -232,19 +233,19 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-socket.h ../include/inn/portable-getaddrinfo.h \
+  ../include/inn/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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/portable/mmap.h ../include/inn/innconf.h \
@@ -254,7 +255,7 @@
   ../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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/hashtab.h ../include/inn/defines.h \
@@ -264,12 +265,12 @@
   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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-socket.h ../include/inn/portable-getaddrinfo.h \
+  ../include/inn/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 \
@@ -278,12 +279,12 @@
   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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.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/portable-socket.h ../include/inn/portable-getaddrinfo.h \
+  ../include/inn/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 \
@@ -292,7 +293,7 @@
   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/portable-macros.h ../include/inn/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 \
@@ -304,7 +305,7 @@
   tradindexed/tradindexed.h
 tradspool/tradspool.o: tradspool/tradspool.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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/portable/mmap.h ../include/inn/innconf.h \
@@ -315,7 +316,7 @@
   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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/libinn.h ../include/inn/defines.h \
@@ -324,7 +325,7 @@
   interface.h
 tradindexed/tdx-util.o: tradindexed/tdx-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/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/options.h ../include/clibrary.h ../include/config.h \
   ../include/inn/macros.h ../include/portable/stdbool.h \
   ../include/inn/buffer.h ../include/inn/libinn.h ../include/inn/defines.h \