INN commit: trunk (35 files)
INN Commit
rra at isc.org
Sat Sep 20 05:53:23 UTC 2014
Date: Friday, September 19, 2014 @ 22:53:22
Author: iulius
Revision: 9695
Remove obsolescent AC_HEADER_TIME macro, that defined TIME_WITH_SYS_TIME
According to the Autoconf manual:
"If a program may include both time.h and sys/time.h, define
TIME_WITH_SYS_TIME. On some ancient systems, sys/time.h included time.h,
but time.h was not protected against multiple inclusion, so programs
could not explicitly include both files.
Current systems can include both sys/time.h and time.h header files
when they exist."
Modified:
trunk/MANIFEST
trunk/authprogs/Makefile
trunk/authprogs/radius.c
trunk/backends/Makefile
trunk/backends/innxbatch.c
trunk/backends/innxmit.c
trunk/backends/nntpget.c
trunk/backends/overchan.c
trunk/configure.ac
trunk/expire/Makefile
trunk/frontends/Makefile
trunk/frontends/inews.c
trunk/frontends/ovdb_server.c
trunk/history/Makefile
trunk/history/his.c
trunk/innd/Makefile
trunk/innd/innd.h
trunk/innfeed/Makefile
trunk/innfeed/connection.c
trunk/innfeed/endpoint.c
trunk/innfeed/main.c
trunk/innfeed/tape.c
trunk/lib/Makefile
trunk/lib/inndcomm.c
trunk/lib/mkstemp.c
trunk/lib/nntp.c
trunk/lib/timer.c
trunk/nnrpd/Makefile
trunk/nnrpd/nnrpd.h
trunk/storage/Makefile
trunk/storage/cnfs/cnfs.c
trunk/storage/ovdb/ovdb.c
trunk/tests/lib/xmalloc.c
trunk/tests/tap/process.c
Deleted:
trunk/include/portable/time.h
-------------------------+
MANIFEST | 1
authprogs/Makefile | 63 ++++++---
authprogs/radius.c | 6
backends/Makefile | 164 ++++++++++++++++---------
backends/innxbatch.c | 6
backends/innxmit.c | 6
backends/nntpget.c | 6
backends/overchan.c | 6
configure.ac | 1
expire/Makefile | 87 ++++++++-----
frontends/Makefile | 126 ++++++++++++-------
frontends/inews.c | 6
frontends/ovdb_server.c | 6
history/Makefile | 23 ++-
history/his.c | 6
include/portable/time.h | 25 ---
innd/Makefile | 295 ++++++++++++++++++++++++++--------------------
innd/innd.h | 6
innfeed/Makefile | 134 ++++++++++++--------
innfeed/connection.c | 6
innfeed/endpoint.c | 6
innfeed/main.c | 6
innfeed/tape.c | 10 -
lib/Makefile | 24 +--
lib/inndcomm.c | 6
lib/mkstemp.c | 2
lib/nntp.c | 6
lib/timer.c | 6
nnrpd/Makefile | 254 +++++++++++++++++++++++----------------
nnrpd/nnrpd.h | 6
storage/Makefile | 258 ++++++++++++++++++++++++----------------
storage/cnfs/cnfs.c | 6
storage/ovdb/ovdb.c | 6
tests/lib/xmalloc.c | 2
tests/tap/process.c | 2
35 files changed, 955 insertions(+), 624 deletions(-)
Modified: MANIFEST
===================================================================
--- MANIFEST 2014-09-17 20:55:11 UTC (rev 9694)
+++ MANIFEST 2014-09-20 05:53:22 UTC (rev 9695)
@@ -422,7 +422,6 @@
include/portable/setproctitle.h Portable setup for setproctitle
include/portable/socket.h Wrapper for <sys/socket.h> and friends
include/portable/stdbool.h Wrapper for <stdbool.h>
-include/portable/time.h Wrapper for <time.h> and <sys/time.h>
include/portable/uio.h Wrapper for <sys/uio.h>
include/portable/wait.h Wrapper for <sys/wait.h>
include/ppport.h Header file for Perl support
Modified: authprogs/Makefile
===================================================================
--- authprogs/Makefile 2014-09-17 20:55:11 UTC (rev 9694)
+++ authprogs/Makefile 2014-09-20 05:53:22 UTC (rev 9695)
@@ -76,38 +76,55 @@
# 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/options.h ../include/clibrary.h \
- ../include/config.h libauth.h ../include/portable/socket.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 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/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/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/messages.h ../include/inn/defines.h \
- ../include/inn/qio.h ../include/inn/vector.h ../include/inn/libinn.h \
- libauth.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/messages.h ../include/inn/qio.h \
+ ../include/inn/defines.h ../include/inn/vector.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h libauth.h \
+ ../include/portable/socket.h ../include/portable/getaddrinfo.h \
../include/portable/getnameinfo.h
domain.o: domain.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/messages.h ../include/inn/defines.h \
- ../include/inn/libinn.h libauth.h ../include/portable/socket.h \
- ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/messages.h \
+ ../include/inn/libinn.h ../include/inn/defines.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h libauth.h \
+ ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+ ../include/portable/getnameinfo.h
ident.o: ident.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/messages.h ../include/inn/defines.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/messages.h \
../include/inn/network.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/inn/libinn.h libauth.h
+ ../include/inn/libinn.h ../include/inn/defines.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h libauth.h
libauth.o: libauth.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/socket.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/inn/messages.h ../include/inn/defines.h libauth.h \
- ../include/inn/libinn.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/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/time.h ../include/inn/innconf.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
../include/inn/defines.h ../include/inn/md5.h ../include/inn/messages.h \
- ../include/inn/libinn.h ../include/inn/nntp.h ../include/inn/paths.h \
- ../include/conffile.h libauth.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 \
+ ../include/inn/nntp.h ../include/inn/paths.h ../include/conffile.h \
+ libauth.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+ ../include/portable/getnameinfo.h
Modified: authprogs/radius.c
===================================================================
--- authprogs/radius.c 2014-09-17 20:55:11 UTC (rev 9694)
+++ authprogs/radius.c 2014-09-20 05:53:22 UTC (rev 9695)
@@ -5,13 +5,17 @@
#include "config.h"
#include "clibrary.h"
-#include "portable/time.h"
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <netdb.h>
#include <signal.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+
/* Needed on AIX 4.1 to get fd_set and friends. */
#if HAVE_SYS_SELECT_H
# include <sys/select.h>
Modified: backends/Makefile
===================================================================
--- backends/Makefile 2014-09-17 20:55:11 UTC (rev 9694)
+++ backends/Makefile 2014-09-20 05:53:22 UTC (rev 9695)
@@ -123,94 +123,136 @@
# 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/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/wait.h ../include/inn/innconf.h \
- ../include/inn/defines.h ../include/inn/messages.h \
- ../include/inn/hashtab.h ../include/inn/qio.h ../include/inn/libinn.h \
+ ../include/inn/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/wait.h \
+ ../include/inn/innconf.h ../include/inn/defines.h \
+ ../include/inn/messages.h ../include/inn/hashtab.h ../include/inn/qio.h \
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
../include/inn/paths.h
archive.o: archive.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/buffer.h ../include/inn/defines.h \
- ../include/inn/innconf.h ../include/inn/messages.h ../include/inn/qio.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/buffer.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/messages.h ../include/inn/qio.h \
../include/inn/vector.h ../include/inn/wire.h ../include/inn/libinn.h \
- ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h \
+ ../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/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/messages.h ../include/inn/timer.h ../include/inn/wire.h \
- ../include/inn/libinn.h ../include/inn/paths.h ../include/inn/storage.h \
- ../include/inn/options.h
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/messages.h \
+ ../include/inn/timer.h ../include/inn/wire.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h \
+ ../include/inn/storage.h ../include/inn/options.h
buffchan.o: buffchan.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/messages.h ../include/inn/qio.h ../include/inn/libinn.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/messages.h ../include/inn/qio.h \
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
../include/inn/paths.h map.h
cvtbatch.o: cvtbatch.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/messages.h ../include/inn/qio.h ../include/inn/wire.h \
- ../include/inn/libinn.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/messages.h ../include/inn/qio.h \
+ ../include/inn/wire.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
+ ../include/inn/xwrite.h ../include/inn/paths.h ../include/inn/storage.h \
../include/inn/options.h
filechan.o: filechan.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/messages.h ../include/inn/libinn.h ../include/inn/paths.h \
- map.h
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/messages.h \
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+ ../include/inn/paths.h map.h
innbind.o: innbind.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/socket.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/inn/libinn.h ../include/inn/defines.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h \
../include/inn/messages.h ../include/inn/newsuser.h \
../include/inn/vector.h
inndf.o: inndf.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/messages.h ../include/inn/overview.h \
- ../include/inn/storage.h ../include/inn/options.h ../include/inn/qio.h \
- ../include/inn/libinn.h ../include/inn/paths.h
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/messages.h \
+ ../include/inn/overview.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/qio.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h
innxbatch.o: innxbatch.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/socket.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/portable/time.h ../include/inn/innconf.h \
- ../include/inn/defines.h ../include/inn/messages.h \
- ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.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/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/socket.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/portable/time.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/nntp.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/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/libinn.h ../include/inn/defines.h \
- ../include/inn/paths.h map.h
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/libinn.h ../include/inn/defines.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h \
+ map.h
ninpaths.o: ninpaths.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.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
nntpget.o: nntpget.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/socket.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/portable/time.h ../include/inn/history.h \
- ../include/inn/defines.h ../include/inn/innconf.h \
- ../include/inn/messages.h ../include/inn/libinn.h ../include/inn/nntp.h \
- ../include/inn/paths.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/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/time.h ../include/inn/innconf.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
../include/inn/defines.h ../include/inn/messages.h \
../include/inn/overview.h ../include/inn/storage.h \
../include/inn/options.h ../include/inn/qio.h ../include/inn/libinn.h \
- ../include/inn/paths.h
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h
shlock.o: shlock.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/messages.h ../include/inn/defines.h
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/messages.h
shrinkfile.o: shrinkfile.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/messages.h ../include/inn/libinn.h
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/messages.h \
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h
Modified: backends/innxbatch.c
===================================================================
--- backends/innxbatch.c 2014-09-17 20:55:11 UTC (rev 9694)
+++ backends/innxbatch.c 2014-09-20 05:53:22 UTC (rev 9695)
@@ -31,7 +31,6 @@
#include "config.h"
#include "clibrary.h"
#include "portable/socket.h"
-#include "portable/time.h"
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
@@ -40,6 +39,11 @@
#include <syslog.h>
#include <sys/stat.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+
/* Needed on AIX 4.1 to get fd_set and friends. */
#ifdef HAVE_SYS_SELECT_H
# include <sys/select.h>
Modified: backends/innxmit.c
===================================================================
--- backends/innxmit.c 2014-09-17 20:55:11 UTC (rev 9694)
+++ backends/innxmit.c 2014-09-20 05:53:22 UTC (rev 9695)
@@ -7,7 +7,6 @@
#include "config.h"
#include "clibrary.h"
#include "portable/socket.h"
-#include "portable/time.h"
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
@@ -17,6 +16,11 @@
#include <sys/stat.h>
#include <sys/uio.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+
/*
** Needed on AIX 4.1 to get fd_set and friends.
*/
Modified: backends/nntpget.c
===================================================================
--- backends/nntpget.c 2014-09-17 20:55:11 UTC (rev 9694)
+++ backends/nntpget.c 2014-09-20 05:53:22 UTC (rev 9695)
@@ -8,11 +8,15 @@
#include "config.h"
#include "clibrary.h"
#include "portable/socket.h"
-#include "portable/time.h"
#include <errno.h>
#include <sys/stat.h>
#include <sys/uio.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+
/* Needed on AIX 4.1 to get fd_set and friends. */
#ifdef HAVE_SYS_SELECT_H
# include <sys/select.h>
Modified: backends/overchan.c
===================================================================
--- backends/overchan.c 2014-09-17 20:55:11 UTC (rev 9694)
+++ backends/overchan.c 2014-09-20 05:53:22 UTC (rev 9695)
@@ -12,11 +12,15 @@
#include "config.h"
#include "clibrary.h"
-#include "portable/time.h"
#include <errno.h>
#include <syslog.h>
#include <sys/stat.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+
#include "inn/innconf.h"
#include "inn/messages.h"
#include "inn/overview.h"
Modified: configure.ac
===================================================================
--- configure.ac 2014-09-17 20:55:11 UTC (rev 9694)
+++ configure.ac 2014-09-20 05:53:22 UTC (rev 9695)
@@ -369,7 +369,6 @@
dnl Special checks for header files.
AC_HEADER_STDBOOL
-AC_HEADER_TIME
AC_HEADER_SYS_WAIT
dnl Generic checks for header files.
Modified: expire/Makefile
===================================================================
--- expire/Makefile 2014-09-17 20:55:11 UTC (rev 9694)
+++ expire/Makefile 2014-09-20 05:53:22 UTC (rev 9695)
@@ -83,53 +83,76 @@
# 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/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/messages.h ../include/inn/defines.h \
- ../include/inn/libinn.h
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/messages.h \
+ ../include/inn/libinn.h ../include/inn/defines.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h
expire.o: expire.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/history.h ../include/inn/defines.h \
- ../include/inn/innconf.h ../include/inn/messages.h \
- ../include/inn/inndcomm.h ../include/inn/libinn.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/history.h \
+ ../include/inn/defines.h ../include/inn/innconf.h \
+ ../include/inn/messages.h ../include/inn/inndcomm.h \
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
../include/inn/newsuser.h ../include/inn/paths.h \
../include/inn/storage.h ../include/inn/options.h
expireover.o: expireover.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/libinn.h ../include/inn/messages.h \
- ../include/inn/newsuser.h ../include/inn/ov.h ../include/inn/storage.h \
- ../include/inn/options.h ../include/inn/history.h ../include/inn/paths.h \
- ../include/inn/qio.h ../include/inn/storage.h
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+ ../include/inn/messages.h ../include/inn/newsuser.h ../include/inn/ov.h \
+ ../include/inn/storage.h ../include/inn/options.h \
+ ../include/inn/history.h ../include/inn/paths.h ../include/inn/qio.h \
+ ../include/inn/storage.h
fastrm.o: fastrm.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/messages.h ../include/inn/qio.h ../include/inn/libinn.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/messages.h ../include/inn/qio.h \
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
../include/inn/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/options.h ../include/inn/history.h \
- ../include/inn/defines.h ../include/inn/innconf.h \
- ../include/inn/messages.h ../include/inn/libinn.h ../include/inn/paths.h \
- ../include/inn/storage.h ../include/inn/options.h
+ ../include/inn/defines.h ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/config.h ../include/inn/options.h ../include/inn/macros.h \
+ ../include/inn/history.h ../include/inn/defines.h \
+ ../include/inn/innconf.h ../include/inn/messages.h \
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+ ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h
makedbz.o: makedbz.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/dbz.h ../include/inn/libinn.h \
- ../include/inn/defines.h ../include/inn/innconf.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/dbz.h ../include/inn/libinn.h \
+ ../include/inn/defines.h ../include/inn/xmalloc.h \
+ ../include/inn/xwrite.h ../include/inn/innconf.h \
../include/inn/messages.h ../include/inn/newsuser.h \
../include/inn/paths.h ../include/inn/qio.h ../include/inn/storage.h \
../include/inn/options.h
makehistory.o: makehistory.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/wait.h ../include/inn/buffer.h \
- ../include/inn/defines.h ../include/inn/history.h \
- ../include/inn/innconf.h ../include/inn/libinn.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/wait.h \
+ ../include/inn/buffer.h ../include/inn/history.h \
+ ../include/inn/defines.h ../include/inn/innconf.h \
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
../include/inn/messages.h ../include/inn/newsuser.h ../include/inn/ov.h \
../include/inn/storage.h ../include/inn/options.h ../include/inn/paths.h \
../include/inn/qio.h ../include/inn/storage.h ../include/inn/vector.h \
../include/inn/wire.h
prunehistory.o: prunehistory.c ../include/config.h \
- ../include/inn/defines.h ../include/inn/system.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/history.h ../include/inn/defines.h \
- ../include/inn/innconf.h ../include/inn/messages.h \
- ../include/inn/libinn.h ../include/inn/paths.h
+ ../include/inn/macros.h ../include/inn/history.h \
+ ../include/inn/defines.h ../include/inn/innconf.h \
+ ../include/inn/messages.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h
Modified: frontends/Makefile
===================================================================
--- frontends/Makefile 2014-09-17 20:55:11 UTC (rev 9694)
+++ frontends/Makefile 2014-09-20 05:53:22 UTC (rev 9695)
@@ -132,79 +132,111 @@
# 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/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/messages.h ../include/inn/inndcomm.h \
- ../include/inn/libinn.h ../include/inn/paths.h
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/messages.h \
+ ../include/inn/inndcomm.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h
decode.o: decode.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/messages.h ../include/inn/defines.h
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/messages.h
encode.o: encode.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.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
getlist.o: getlist.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/messages.h ../include/inn/nntp.h ../include/inn/qio.h \
- ../include/inn/vector.h ../include/inn/libinn.h ../include/inn/paths.h
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/messages.h ../include/inn/nntp.h \
+ ../include/inn/qio.h ../include/inn/vector.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h
inews.o: inews.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/time.h ../include/inn/innconf.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
../include/inn/defines.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h \
../include/inn/messages.h ../include/inn/newsuser.h \
../include/inn/nntp.h ../include/inn/paths.h
innconfval.o: innconfval.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/messages.h ../include/inn/version.h \
- ../include/inn/libinn.h
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/messages.h \
+ ../include/inn/version.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h
ovdb_init.o: ovdb_init.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/libinn.h ../include/inn/defines.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/libinn.h ../include/inn/defines.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h \
../include/inn/innconf.h ../include/inn/messages.h ../include/inn/ov.h \
../include/inn/storage.h ../include/inn/options.h \
../include/inn/history.h ../storage/ovdb/ovdb.h \
../storage/ovdb/ovdb-private.h
ovdb_monitor.o: ovdb_monitor.c ../include/config.h \
- ../include/inn/defines.h ../include/inn/system.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/portable/setproctitle.h ../include/portable/wait.h \
- ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/messages.h ../include/inn/libinn.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/options.h \
+ ../include/inn/macros.h ../include/portable/setproctitle.h \
+ ../include/portable/wait.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/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/mmap.h \
- ../include/portable/time.h ../include/portable/setproctitle.h \
- ../include/portable/socket.h ../include/portable/getaddrinfo.h \
- ../include/portable/getnameinfo.h ../include/portable/wait.h \
- ../include/inn/fdflag.h ../include/inn/defines.h \
- ../include/inn/innconf.h ../include/inn/messages.h \
- ../include/inn/libinn.h ../include/inn/paths.h ../include/inn/storage.h \
- ../include/inn/options.h ../include/inn/ov.h ../include/inn/storage.h \
- ../include/inn/history.h ../storage/ovdb/ovdb.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/portable/mmap.h \
+ ../include/portable/setproctitle.h ../include/portable/socket.h \
+ ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+ ../include/portable/wait.h ../include/inn/fdflag.h \
+ ../include/inn/innconf.h ../include/inn/defines.h \
+ ../include/inn/messages.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h \
+ ../include/inn/storage.h ../include/inn/options.h ../include/inn/ov.h \
+ ../include/inn/storage.h ../include/inn/history.h ../storage/ovdb/ovdb.h \
../storage/ovdb/ovdb-private.h
ovdb_stat.o: ovdb_stat.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/messages.h ../include/inn/libinn.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/options.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/messages.h \
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+ ../include/inn/ov.h ../include/inn/storage.h ../include/inn/options.h \
../include/inn/history.h ../include/inn/paths.h ../include/inn/storage.h \
../storage/ovdb/ovdb.h ../storage/ovdb/ovdb-private.h
rnews.o: rnews.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/wait.h ../include/inn/fdflag.h \
- ../include/inn/defines.h ../include/portable/socket.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/wait.h \
+ ../include/inn/fdflag.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/inn/innconf.h ../include/inn/libinn.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/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/buffer.h ../include/inn/defines.h \
- ../include/inn/innconf.h ../include/inn/messages.h ../include/inn/qio.h \
- ../include/inn/wire.h ../include/inn/libinn.h ../include/inn/storage.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/buffer.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/messages.h ../include/inn/qio.h \
+ ../include/inn/wire.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
+ ../include/inn/xwrite.h ../include/inn/storage.h \
../include/inn/options.h
Modified: frontends/inews.c
===================================================================
--- frontends/inews.c 2014-09-17 20:55:11 UTC (rev 9694)
+++ frontends/inews.c 2014-09-20 05:53:22 UTC (rev 9695)
@@ -6,13 +6,17 @@
#include "config.h"
#include "clibrary.h"
-#include "portable/time.h"
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <pwd.h>
#include <sys/stat.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+
#include "inn/innconf.h"
#include "inn/libinn.h"
#include "inn/messages.h"
Modified: frontends/ovdb_server.c
===================================================================
--- frontends/ovdb_server.c 2014-09-17 20:55:11 UTC (rev 9694)
+++ frontends/ovdb_server.c 2014-09-20 05:53:22 UTC (rev 9695)
@@ -6,7 +6,6 @@
#include "config.h"
#include "clibrary.h"
#include "portable/mmap.h"
-#include "portable/time.h"
#include "portable/setproctitle.h"
#include "portable/socket.h"
#include "portable/wait.h"
@@ -18,6 +17,11 @@
#endif
#include <syslog.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+
#ifdef HAVE_UNIX_DOMAIN_SOCKETS
# include <sys/un.h>
#endif
Modified: history/Makefile
===================================================================
--- history/Makefile 2014-09-17 20:55:11 UTC (rev 9694)
+++ history/Makefile 2014-09-20 05:53:22 UTC (rev 9695)
@@ -99,20 +99,27 @@
# 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/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/time.h ../include/inn/history.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/history.h \
../include/inn/defines.h ../include/inn/messages.h \
- ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/storage.h \
+ ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
+ ../include/inn/xwrite.h ../include/inn/storage.h \
../include/inn/options.h hisinterface.h hismethods.h
hismethods.o: hismethods.c hisinterface.h ../include/config.h \
- ../include/inn/defines.h ../include/inn/system.h \
+ ../include/inn/defines.h ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/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/options.h ../include/clibrary.h \
- ../include/config.h hisinterface.h hisv6/hisv6.h hisv6/hisv6-private.h \
- ../include/inn/history.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 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/dbz.h ../include/inn/fdflag.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 \
Modified: history/his.c
===================================================================
--- history/his.c 2014-09-17 20:55:11 UTC (rev 9694)
+++ history/his.c 2014-09-20 05:53:22 UTC (rev 9695)
@@ -39,10 +39,14 @@
#include "config.h"
#include "clibrary.h"
-#include "portable/time.h"
#include <errno.h>
#include <syslog.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+
#include "inn/history.h"
#include "inn/messages.h"
#include "inn/timer.h"
Deleted: include/portable/time.h
===================================================================
--- include/portable/time.h 2014-09-17 20:55:11 UTC (rev 9694)
+++ include/portable/time.h 2014-09-20 05:53:22 UTC (rev 9695)
@@ -1,25 +0,0 @@
-/* $Id$
-**
-** Portability wrapper around <time.h> and <sys/time.h>.
-**
-** This header includes <time.h> and <sys/time.h> as applicable, handling
-** systems where one can't include both headers (per the autoconf manual).
-*/
-
-#ifndef PORTABLE_TIME_H
-#define PORTABLE_TIME_H 1
-
-#include "config.h"
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
-#endif /* PORTABLE_TIME_H */
Modified: innd/Makefile
===================================================================
--- innd/Makefile 2014-09-17 20:55:11 UTC (rev 9694)
+++ innd/Makefile 2014-09-20 05:53:22 UTC (rev 9695)
@@ -70,184 +70,229 @@
# 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/options.h ../include/clibrary.h \
- ../include/config.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/time.h ../include/portable/socket.h \
- ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/inn/buffer.h ../include/inn/messages.h ../include/inn/timer.h \
- ../include/inn/libinn.h ../include/inn/nntp.h ../include/inn/paths.h
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/md5.h ../include/inn/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 \
+ ../include/portable/getnameinfo.h ../include/inn/buffer.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
cc.o: cc.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/qio.h innd.h ../include/portable/time.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/qio.h 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/nntp.h \
- ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.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/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/fdflag.h ../include/inn/defines.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/fdflag.h \
../include/portable/socket.h ../include/portable/getaddrinfo.h \
../include/portable/getnameinfo.h ../include/inn/innconf.h \
- ../include/inn/network.h innd.h ../include/portable/time.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/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
- ../include/inn/options.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/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/mmap.h ../include/inn/fdflag.h \
- ../include/inn/defines.h ../include/portable/socket.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/portable/mmap.h \
+ ../include/inn/fdflag.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/inn/innconf.h ../include/inn/mmap.h innd.h \
- ../include/portable/time.h ../include/inn/buffer.h \
- ../include/inn/history.h ../include/inn/messages.h \
- ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
+ ../include/inn/innconf.h ../include/inn/defines.h ../include/inn/mmap.h \
+ innd.h ../include/inn/buffer.h ../include/inn/history.h \
+ ../include/inn/messages.h ../include/inn/timer.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/nntp.h \
../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
../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/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/messages.h ../include/inn/newsuser.h ../include/innperl.h \
- innd.h ../include/portable/time.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/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/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/libinn.h ../include/inn/defines.h \
- ../include/inn/innconf.h innd.h ../include/portable/time.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/messages.h \
+ ../include/inn/newsuser.h ../include/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/messages.h \
- ../include/inn/timer.h ../include/inn/nntp.h ../include/inn/paths.h \
- ../include/inn/storage.h ../include/inn/options.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/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.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/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- innd.h ../include/portable/time.h ../include/portable/socket.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h innd.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/inn/libinn.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
- ../include/inn/options.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
nc.o: nc.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/qio.h ../include/inn/version.h innd.h \
- ../include/portable/time.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/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
- ../include/inn/options.h
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/qio.h ../include/inn/version.h \
+ innd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+ ../include/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/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- innd.h ../include/portable/time.h ../include/portable/socket.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h innd.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/inn/libinn.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
- ../include/inn/options.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/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- innd.h ../include/portable/time.h ../include/portable/socket.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h innd.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/inn/libinn.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
- ../include/inn/options.h ../include/inn/ov.h ../include/inn/storage.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/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/wire.h ../include/inn/defines.h \
- innd.h ../include/portable/time.h ../include/portable/socket.h \
- ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/inn/buffer.h ../include/inn/history.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/wire.h ../include/inn/defines.h \
+ innd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+ ../include/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/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/portable/wait.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/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/nntp.h \
+ ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h
+python.o: python.c ../include/config.h ../include/inn/defines.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
../include/inn/options.h \
- ../include/ppport.h \
- ../include/innperl.h
-proc.o: proc.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/wait.h innd.h \
- ../include/portable/time.h ../include/portable/socket.h \
- ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/inn/buffer.h ../include/inn/defines.h \
+ ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
+ ../include/inn/innconf.h ../include/inn/defines.h ../include/inn/wire.h \
+ innd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+ ../include/portable/getnameinfo.h ../include/inn/buffer.h \
../include/inn/history.h ../include/inn/messages.h \
- ../include/inn/timer.h ../include/inn/libinn.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/options.h \
- ../include/clibrary.h ../include/config.h ../include/inn/innconf.h \
- ../include/inn/defines.h ../include/inn/wire.h innd.h \
- ../include/portable/time.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/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
- ../include/inn/options.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/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/socket.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/inn/fdflag.h ../include/inn/defines.h \
- ../include/inn/innconf.h ../include/inn/network.h \
- ../include/inn/vector.h innd.h ../include/portable/time.h \
+ ../include/inn/fdflag.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/network.h \
+ ../include/inn/network-innbind.h ../include/inn/vector.h innd.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/inn/libinn.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
- ../include/inn/options.h
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/nntp.h \
+ ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h
site.o: site.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/fdflag.h ../include/inn/defines.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/fdflag.h \
../include/portable/socket.h ../include/portable/getaddrinfo.h \
- ../include/portable/getnameinfo.h ../include/inn/innconf.h innd.h \
- ../include/portable/time.h ../include/inn/buffer.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/nntp.h \
- ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.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/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/socket.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/inn/network.h ../include/inn/defines.h \
- ../include/inn/innconf.h ../include/inn/version.h innd.h \
- ../include/portable/time.h ../include/inn/buffer.h \
- ../include/inn/history.h ../include/inn/messages.h \
- ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
+ ../include/inn/network.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/version.h innd.h \
+ ../include/inn/buffer.h ../include/inn/history.h \
+ ../include/inn/messages.h ../include/inn/timer.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/nntp.h \
../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
../include/innperl.h
util.o: util.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/fdflag.h ../include/inn/defines.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/fdflag.h \
../include/portable/socket.h ../include/portable/getaddrinfo.h \
../include/portable/getnameinfo.h ../include/inn/innconf.h \
- ../include/inn/libinn.h innd.h ../include/portable/time.h \
+ ../include/inn/defines.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h innd.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/inn/nntp.h \
../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h
wip.o: wip.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- innd.h ../include/portable/time.h ../include/portable/socket.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h innd.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/inn/libinn.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
- ../include/inn/options.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/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/wait.h ../include/inn/dispatch.h \
- ../include/inn/messages.h ../include/inn/defines.h ../include/inn/md5.h \
- ../include/inn/nntp.h ../include/inn/utility.h ../include/inn/vector.h \
- ../include/inn/version.h ../include/inn/libinn.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/wait.h \
+ ../include/inn/dispatch.h ../include/inn/messages.h ../include/inn/md5.h \
+ ../include/inn/defines.h ../include/inn/nntp.h ../include/inn/utility.h \
+ ../include/inn/vector.h ../include/inn/version.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h
Modified: innd/innd.h
===================================================================
--- innd/innd.h 2014-09-17 20:55:11 UTC (rev 9694)
+++ innd/innd.h 2014-09-20 05:53:22 UTC (rev 9695)
@@ -28,7 +28,6 @@
#define INND_H 1
#include "config.h"
-#include "portable/time.h"
#include "portable/socket.h"
#include <ctype.h>
#include <errno.h>
@@ -37,6 +36,11 @@
#include <syslog.h>
#include <sys/stat.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+
#include "inn/buffer.h"
#include "inn/history.h"
#include "inn/messages.h"
Modified: innfeed/Makefile
===================================================================
--- innfeed/Makefile 2014-09-17 20:55:11 UTC (rev 9694)
+++ innfeed/Makefile 2014-09-20 05:53:22 UTC (rev 9695)
@@ -98,82 +98,110 @@
# 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/config.h \
- ../include/inn/defines.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/mmap.h ../include/inn/messages.h \
- ../include/inn/libinn.h ../include/inn/storage.h \
- ../include/inn/options.h article.h misc.h buffer.h endpoint.h
+ ../include/inn/defines.h ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/config.h ../include/inn/defines.h ../include/inn/options.h \
+ ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
+ ../include/portable/mmap.h ../include/inn/messages.h \
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+ ../include/inn/storage.h ../include/inn/options.h article.h misc.h \
+ buffer.h endpoint.h
buffer.o: buffer.c innfeed.h ../include/inn/timer.h \
- ../include/inn/defines.h ../include/inn/system.h ../include/config.h \
- ../include/inn/defines.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/messages.h ../include/inn/libinn.h \
- buffer.h misc.h
+ ../include/inn/defines.h ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/config.h ../include/inn/defines.h ../include/inn/options.h \
+ ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
+ ../include/inn/messages.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h buffer.h misc.h
config_l.o: config_l.c innfeed.h ../include/inn/timer.h \
- ../include/inn/defines.h ../include/inn/system.h ../include/inn/libinn.h \
- configfile.h config_y.h misc.h ../include/config.h \
- ../include/inn/defines.h ../include/inn/options.h
+ ../include/inn/defines.h ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/config.h ../include/inn/defines.h ../include/inn/options.h \
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+ configfile.h config_y.h misc.h
config_y.o: config_y.c innfeed.h ../include/inn/timer.h \
- ../include/inn/defines.h ../include/inn/system.h ../include/config.h \
- ../include/inn/defines.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/messages.h ../include/inn/libinn.h \
- configfile.h misc.h
+ ../include/inn/defines.h ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/config.h ../include/inn/defines.h ../include/inn/options.h \
+ ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
+ ../include/inn/messages.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h configfile.h misc.h
connection.o: connection.c innfeed.h ../include/inn/timer.h \
- ../include/inn/defines.h ../include/inn/system.h ../include/config.h \
- ../include/inn/defines.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/socket.h \
- ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/portable/time.h ../include/inn/fdflag.h \
+ ../include/inn/defines.h ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/config.h ../include/inn/defines.h ../include/inn/options.h \
+ ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
+ ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+ ../include/portable/getnameinfo.h ../include/inn/fdflag.h \
../include/inn/innconf.h ../include/inn/messages.h \
- ../include/inn/network.h ../include/inn/libinn.h article.h misc.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/config.h \
- ../include/inn/defines.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/socket.h \
- ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/portable/time.h ../include/inn/innconf.h \
- ../include/inn/messages.h ../include/inn/libinn.h buffer.h misc.h \
+ ../include/inn/defines.h ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/config.h ../include/inn/defines.h ../include/inn/options.h \
+ ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
+ ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+ ../include/portable/getnameinfo.h ../include/inn/innconf.h \
+ ../include/inn/messages.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h buffer.h misc.h \
configfile.h endpoint.h host.h
host.o: host.c innfeed.h ../include/inn/timer.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/config.h ../include/inn/defines.h \
- ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/config.h ../include/inn/defines.h ../include/inn/options.h \
+ ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
../include/portable/socket.h ../include/portable/getaddrinfo.h \
../include/portable/getnameinfo.h ../include/inn/innconf.h \
../include/inn/messages.h ../include/inn/network.h \
- ../include/inn/version.h ../include/inn/libinn.h article.h misc.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/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/portable/socket.h ../include/portable/getaddrinfo.h \
- ../include/portable/getnameinfo.h ../include/inn/messages.h \
- ../include/inn/defines.h ../include/inn/libinn.h buffer.h misc.h \
- connection.h endpoint.h host.h innfeed.h ../include/inn/timer.h \
- article.h configfile.h
+ ../include/inn/macros.h ../include/portable/socket.h \
+ ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+ ../include/inn/messages.h ../include/inn/libinn.h \
+ ../include/inn/defines.h ../include/inn/xmalloc.h \
+ ../include/inn/xwrite.h buffer.h misc.h connection.h endpoint.h host.h \
+ innfeed.h ../include/inn/timer.h article.h configfile.h
innlistener.o: innlistener.c innfeed.h ../include/inn/timer.h \
- ../include/inn/defines.h ../include/inn/system.h ../include/config.h \
- ../include/inn/defines.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/libinn.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/inn/defines.h ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/config.h ../include/inn/defines.h ../include/inn/options.h \
+ ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+ ../include/inn/messages.h ../include/inn/nntp.h article.h misc.h \
+ buffer.h configfile.h endpoint.h host.h innlistener.h tape.h
main.o: main.c innfeed.h ../include/inn/timer.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/config.h ../include/inn/defines.h \
- ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/config.h ../include/inn/defines.h ../include/inn/options.h \
+ ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
../include/portable/socket.h ../include/portable/getaddrinfo.h \
- ../include/portable/getnameinfo.h ../include/portable/time.h \
- ../include/inn/innconf.h ../include/inn/messages.h \
- ../include/inn/version.h ../include/inn/libinn.h \
+ ../include/portable/getnameinfo.h ../include/inn/innconf.h \
+ ../include/inn/messages.h ../include/inn/version.h \
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
../include/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/config.h ../include/inn/defines.h \
- ../include/inn/options.h ../include/clibrary.h ../include/config.h \
- ../include/inn/messages.h ../include/inn/libinn.h endpoint.h misc.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/config.h ../include/inn/defines.h ../include/inn/options.h \
+ ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
+ ../include/inn/messages.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h endpoint.h misc.h \
tape.h
tape.o: tape.c innfeed.h ../include/inn/timer.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/config.h ../include/inn/defines.h \
- ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/config.h ../include/inn/defines.h ../include/inn/options.h \
+ ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
../include/inn/innconf.h ../include/inn/messages.h \
- ../include/inn/libinn.h article.h misc.h configfile.h endpoint.h tape.h
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+ article.h misc.h configfile.h endpoint.h tape.h
Modified: innfeed/connection.c
===================================================================
--- innfeed/connection.c 2014-09-17 20:55:11 UTC (rev 9694)
+++ innfeed/connection.c 2014-09-20 05:53:22 UTC (rev 9695)
@@ -51,7 +51,6 @@
#include "config.h"
#include "clibrary.h"
#include "portable/socket.h"
-#include "portable/time.h"
#include <assert.h>
#include <errno.h>
@@ -60,6 +59,11 @@
#include <signal.h>
#include <syslog.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+
#if defined (__FreeBSD__)
# include <sys/ioctl.h>
#endif
Modified: innfeed/endpoint.c
===================================================================
--- innfeed/endpoint.c 2014-09-17 20:55:11 UTC (rev 9694)
+++ innfeed/endpoint.c 2014-09-20 05:53:22 UTC (rev 9695)
@@ -16,7 +16,6 @@
#include "config.h"
#include "clibrary.h"
#include "portable/socket.h"
-#include "portable/time.h"
#include <assert.h>
#include <errno.h>
@@ -34,6 +33,11 @@
# include <sys/select.h>
#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+
#include "inn/innconf.h"
#include "inn/messages.h"
#include "inn/libinn.h"
Modified: innfeed/main.c
===================================================================
--- innfeed/main.c 2014-09-17 20:55:11 UTC (rev 9694)
+++ innfeed/main.c 2014-09-20 05:53:22 UTC (rev 9695)
@@ -9,7 +9,6 @@
#include "config.h"
#include "clibrary.h"
#include "portable/socket.h"
-#include "portable/time.h"
#include <assert.h>
#include <ctype.h>
@@ -21,6 +20,11 @@
#include <sys/stat.h>
#include <syslog.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+
#if defined(HAVE_UNIX_DOMAIN_SOCKETS)
# include <sys/un.h>
#endif
Modified: innfeed/tape.c
===================================================================
--- innfeed/tape.c 2014-09-17 20:55:11 UTC (rev 9694)
+++ innfeed/tape.c 2014-09-20 05:53:22 UTC (rev 9695)
@@ -30,16 +30,10 @@
#include <dirent.h>
typedef struct dirent DIRENTRY ;
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
#endif
+#include <time.h>
#include "inn/innconf.h"
#include "inn/messages.h"
Modified: lib/Makefile
===================================================================
--- lib/Makefile 2014-09-17 20:55:11 UTC (rev 9694)
+++ lib/Makefile 2014-09-20 05:53:22 UTC (rev 9695)
@@ -257,12 +257,11 @@
../include/inn/system.h ../include/inn/macros.h \
../include/portable/macros.h ../include/portable/stdbool.h \
../include/inn/options.h ../include/clibrary.h ../include/config.h \
- ../include/inn/macros.h ../include/portable/time.h \
- ../include/portable/socket.h ../include/portable/getaddrinfo.h \
- ../include/portable/getnameinfo.h ../include/inn/innconf.h \
- ../include/inn/defines.h ../include/inn/inndcomm.h \
- ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
- ../include/inn/paths.h
+ ../include/inn/macros.h ../include/portable/socket.h \
+ ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.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 \
@@ -346,10 +345,10 @@
../include/inn/options.h ../include/clibrary.h ../include/config.h \
../include/inn/macros.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/portable/time.h ../include/inn/buffer.h \
- ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/network.h ../include/inn/nntp.h ../include/inn/vector.h \
- ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h
+ ../include/inn/buffer.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/network.h ../include/inn/nntp.h \
+ ../include/inn/vector.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
+ ../include/inn/xwrite.h
numbers.o: numbers.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/macros.h \
../include/portable/macros.h ../include/portable/stdbool.h \
@@ -419,8 +418,7 @@
../include/inn/system.h ../include/inn/macros.h \
../include/portable/macros.h ../include/portable/stdbool.h \
../include/inn/options.h ../include/clibrary.h ../include/config.h \
- ../include/inn/macros.h ../include/portable/time.h \
- ../include/inn/messages.h ../include/inn/timer.h \
+ ../include/inn/macros.h ../include/inn/messages.h ../include/inn/timer.h \
../include/inn/defines.h ../include/inn/libinn.h \
../include/inn/xmalloc.h ../include/inn/xwrite.h
tst.o: tst.c ../include/config.h ../include/inn/defines.h \
@@ -531,7 +529,7 @@
../include/inn/system.h ../include/inn/macros.h \
../include/portable/macros.h ../include/portable/stdbool.h \
../include/inn/options.h ../include/clibrary.h ../include/config.h \
- ../include/inn/macros.h ../include/portable/time.h
+ ../include/inn/macros.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 \
Modified: lib/inndcomm.c
===================================================================
--- lib/inndcomm.c 2014-09-17 20:55:11 UTC (rev 9694)
+++ lib/inndcomm.c 2014-09-20 05:53:22 UTC (rev 9695)
@@ -5,7 +5,6 @@
#include "config.h"
#include "clibrary.h"
-#include "portable/time.h"
#include "portable/socket.h"
#include <ctype.h>
#include <errno.h>
@@ -13,6 +12,11 @@
#include <signal.h>
#include <sys/stat.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+
/* Needed on AIX 4.1 to get fd_set and friends. */
#ifdef HAVE_SYS_SELECT_H
# include <sys/select.h>
Modified: lib/mkstemp.c
===================================================================
--- lib/mkstemp.c 2014-09-17 20:55:11 UTC (rev 9694)
+++ lib/mkstemp.c 2014-09-20 05:53:22 UTC (rev 9695)
@@ -24,7 +24,7 @@
#include <errno.h>
#include <fcntl.h>
-#include "portable/time.h"
+#include <sys/time.h>
/*
* If we're running the test suite, rename mkstemp to avoid conflicts with the
Modified: lib/nntp.c
===================================================================
--- lib/nntp.c 2014-09-17 20:55:11 UTC (rev 9694)
+++ lib/nntp.c 2014-09-20 05:53:22 UTC (rev 9695)
@@ -9,10 +9,14 @@
#include "config.h"
#include "clibrary.h"
#include "portable/socket.h"
-#include "portable/time.h"
#include <ctype.h>
#include <errno.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+
#include "inn/buffer.h"
#include "inn/innconf.h"
#include "inn/network.h"
Modified: lib/timer.c
===================================================================
--- lib/timer.c 2014-09-17 20:55:11 UTC (rev 9694)
+++ lib/timer.c 2014-09-20 05:53:22 UTC (rev 9695)
@@ -39,9 +39,13 @@
#include "config.h"
#include "clibrary.h"
-#include "portable/time.h"
#include <syslog.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+
#include "inn/messages.h"
#include "inn/timer.h"
#include "inn/libinn.h"
Modified: nnrpd/Makefile
===================================================================
--- nnrpd/Makefile 2014-09-17 20:55:11 UTC (rev 9694)
+++ nnrpd/Makefile 2014-09-20 05:53:22 UTC (rev 9695)
@@ -70,160 +70,208 @@
# 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/options.h ../include/clibrary.h \
- ../include/config.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/portable/time.h \
- ../include/inn/qio.h ../include/inn/libinn.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/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/messages.h ../include/inn/wire.h \
+ nnrpd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+ ../include/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/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/wait.h ../include/inn/buffer.h \
- ../include/inn/defines.h ../include/inn/messages.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/wait.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/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
- ../include/inn/options.h ../include/inn/timer.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/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/tst.h ../include/inn/list.h ../include/inn/libinn.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/tst.h ../include/inn/list.h \
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
../include/inn/storage.h ../include/inn/options.h cache.h
group.o: group.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- nnrpd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
- ../include/portable/getnameinfo.h ../include/portable/time.h \
- ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/nntp.h \
- ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h nnrpd.h ../include/portable/socket.h \
+ ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+ ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
+ ../include/inn/xwrite.h ../include/inn/nntp.h ../include/inn/paths.h \
+ ../include/inn/storage.h ../include/inn/options.h \
../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
../include/inn/storage.h ../include/inn/history.h
commands.o: commands.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/wait.h nnrpd.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/wait.h nnrpd.h \
../include/portable/socket.h ../include/portable/getaddrinfo.h \
- ../include/portable/getnameinfo.h ../include/portable/time.h \
- ../include/inn/qio.h ../include/inn/defines.h ../include/inn/libinn.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/innconf.h \
- ../include/inn/messages.h ../include/inn/version.h tls.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/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/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/messages.h ../include/inn/defines.h \
- nnrpd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
- ../include/portable/getnameinfo.h ../include/portable/time.h \
- ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/nntp.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/messages.h nnrpd.h \
+ ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+ ../include/portable/getnameinfo.h ../include/inn/qio.h \
+ ../include/inn/defines.h ../include/inn/libinn.h \
+ ../include/inn/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/options.h ../include/clibrary.h \
- ../include/config.h nnrpd.h ../include/portable/socket.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h nnrpd.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/portable/time.h ../include/inn/qio.h ../include/inn/defines.h \
- ../include/inn/libinn.h ../include/inn/nntp.h ../include/inn/paths.h \
- ../include/inn/storage.h ../include/inn/options.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 \
../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/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- nnrpd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
- ../include/portable/getnameinfo.h ../include/portable/time.h \
- ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/nntp.h \
- ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h nnrpd.h ../include/portable/socket.h \
+ ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+ ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
+ ../include/inn/xwrite.h ../include/inn/nntp.h ../include/inn/paths.h \
+ ../include/inn/storage.h ../include/inn/options.h \
../include/inn/vector.h ../include/inn/timer.h 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/options.h ../include/clibrary.h \
- ../include/config.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/portable/time.h \
- ../include/inn/qio.h ../include/inn/libinn.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/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/messages.h ../include/inn/wire.h \
+ nnrpd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+ ../include/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/options.h \
- ../include/portable/alloca.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/portable/alloca.h \
+ ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
../include/portable/setproctitle.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/portable/wait.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/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/portable/time.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/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- nnrpd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
- ../include/portable/getnameinfo.h ../include/portable/time.h \
- ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/nntp.h \
- ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h nnrpd.h ../include/portable/socket.h \
+ ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+ ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
+ ../include/inn/xwrite.h ../include/inn/nntp.h ../include/inn/paths.h \
+ ../include/inn/storage.h ../include/inn/options.h \
../include/inn/vector.h ../include/inn/timer.h 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/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/wait.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/portable/time.h \
- ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/nntp.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/wait.h ../include/conffile.h \
+ ../include/inn/network.h ../include/portable/socket.h \
+ ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+ ../include/inn/innconf.h ../include/inn/defines.h ../include/innperl.h \
+ nnrpd.h ../include/inn/qio.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/nntp.h \
../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
../include/inn/vector.h ../include/inn/timer.h
post.o: post.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- nnrpd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
- ../include/portable/getnameinfo.h ../include/portable/time.h \
- ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/nntp.h \
- ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h nnrpd.h ../include/portable/socket.h \
+ ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+ ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
+ ../include/inn/xwrite.h ../include/inn/nntp.h ../include/inn/paths.h \
+ ../include/inn/storage.h ../include/inn/options.h \
../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
../include/inn/storage.h ../include/inn/history.h post.h
python.o: python.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h \
- ../include/clibrary.h ../include/config.h ../include/inn/innconf.h \
- ../include/inn/defines.h nnrpd.h ../include/portable/socket.h \
- ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h \
+ ../include/clibrary.h ../include/config.h ../include/inn/macros.h \
+ ../include/inn/innconf.h ../include/inn/defines.h nnrpd.h \
+ ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+ ../include/portable/getnameinfo.h ../include/inn/qio.h \
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
../include/inn/hashtab.h
sasl.o: sasl.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/messages.h ../include/inn/defines.h \
- nnrpd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
- ../include/portable/getnameinfo.h ../include/portable/time.h \
- ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/nntp.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/messages.h nnrpd.h \
+ ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+ ../include/portable/getnameinfo.h ../include/inn/qio.h \
+ ../include/inn/defines.h ../include/inn/libinn.h \
+ ../include/inn/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/options.h ../include/clibrary.h \
- ../include/config.h nnrpd.h ../include/portable/socket.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h nnrpd.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/portable/time.h ../include/inn/qio.h ../include/inn/defines.h \
- ../include/inn/libinn.h ../include/inn/nntp.h ../include/inn/paths.h \
- ../include/inn/storage.h ../include/inn/options.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/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- nnrpd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
- ../include/portable/getnameinfo.h ../include/portable/time.h \
- ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/nntp.h \
- ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h nnrpd.h ../include/portable/socket.h \
+ ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+ ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
+ ../include/inn/xwrite.h ../include/inn/nntp.h ../include/inn/paths.h \
+ ../include/inn/storage.h ../include/inn/options.h \
../include/inn/vector.h ../include/inn/timer.h
Modified: nnrpd/nnrpd.h
===================================================================
--- nnrpd/nnrpd.h 2014-09-17 20:55:11 UTC (rev 9694)
+++ nnrpd/nnrpd.h 2014-09-20 05:53:22 UTC (rev 9695)
@@ -5,7 +5,6 @@
#include "config.h"
#include "portable/socket.h"
-#include "portable/time.h"
#include <ctype.h>
#include <errno.h>
@@ -13,6 +12,11 @@
#include <syslog.h>
#include <sys/stat.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+
#include "inn/qio.h"
#include "inn/libinn.h"
#include "inn/nntp.h"
Modified: storage/Makefile
===================================================================
--- storage/Makefile 2014-09-17 20:55:11 UTC (rev 9694)
+++ storage/Makefile 2014-09-20 05:53:22 UTC (rev 9695)
@@ -105,166 +105,218 @@
# 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/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/libinn.h ../include/inn/ov.h ../include/inn/storage.h \
- ../include/inn/options.h ../include/inn/history.h ovinterface.h \
- ../include/inn/storage.h ../include/inn/paths.h ../include/inn/vector.h
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/ov.h \
+ ../include/inn/storage.h ../include/inn/options.h \
+ ../include/inn/history.h ovinterface.h ../include/inn/storage.h \
+ ../include/inn/paths.h ../include/inn/vector.h
interface.o: interface.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/conffile.h ../include/inn/innconf.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/conffile.h ../include/inn/innconf.h \
../include/inn/defines.h ../include/inn/messages.h ../include/inn/wire.h \
interface.h ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/libinn.h methods.h ../include/inn/paths.h
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+ methods.h ../include/inn/paths.h
methods.o: methods.c interface.h ../include/config.h \
- ../include/inn/defines.h ../include/inn/system.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/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/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/messages.h ../include/inn/wire.h ../include/inn/vector.h \
- ../include/inn/libinn.h ../include/inn/ov.h ../include/inn/storage.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/messages.h ../include/inn/wire.h \
+ ../include/inn/vector.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
+ ../include/inn/xwrite.h ../include/inn/ov.h ../include/inn/storage.h \
../include/inn/options.h ../include/inn/history.h ovinterface.h \
../include/inn/storage.h ovmethods.h
overdata.o: overdata.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/buffer.h ../include/inn/defines.h \
- ../include/inn/innconf.h ../include/inn/messages.h ../include/inn/wire.h \
- ../include/inn/vector.h ../include/inn/libinn.h ovinterface.h \
- ../include/inn/history.h ../include/inn/ov.h ../include/inn/storage.h \
- ../include/inn/options.h ../include/inn/storage.h
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/buffer.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/messages.h ../include/inn/wire.h \
+ ../include/inn/vector.h ../include/inn/libinn.h ../include/inn/xmalloc.h \
+ ../include/inn/xwrite.h ovinterface.h ../include/inn/history.h \
+ ../include/inn/ov.h ../include/inn/storage.h ../include/inn/options.h \
+ ../include/inn/storage.h
overview.o: overview.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/buffer.h ../include/inn/defines.h \
- ../include/inn/innconf.h ../include/inn/messages.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/buffer.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/messages.h \
../include/inn/overview.h ../include/inn/storage.h \
../include/inn/options.h ../include/inn/wire.h ../include/inn/vector.h \
- ../include/inn/libinn.h ../include/inn/ov.h ../include/inn/storage.h \
- ../include/inn/history.h ovinterface.h ovmethods.h
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+ ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h \
+ ovinterface.h ovmethods.h
ovmethods.o: ovmethods.c ovinterface.h ../include/config.h \
- ../include/inn/defines.h ../include/inn/system.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/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/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/portable/mmap.h ../include/inn/innconf.h \
- ../include/inn/defines.h ../include/inn/messages.h \
- ../include/inn/libinn.h ../include/inn/ov.h ../include/inn/storage.h \
- ../include/inn/options.h ../include/inn/history.h ../include/inn/paths.h \
- ovinterface.h ../include/inn/storage.h ../include/inn/fdflag.h \
+ ../include/inn/macros.h ../include/portable/mmap.h \
+ ../include/inn/innconf.h ../include/inn/defines.h \
+ ../include/inn/messages.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/ov.h \
+ ../include/inn/storage.h ../include/inn/options.h \
+ ../include/inn/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 \
buffindexed/buffindexed.h
buffindexed/shmem.o: buffindexed/shmem.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/messages.h ../include/inn/defines.h \
- ../include/inn/libinn.h buffindexed/shmem.h
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/messages.h \
+ ../include/inn/libinn.h ../include/inn/defines.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h buffindexed/shmem.h
cnfs/cnfs.o: cnfs/cnfs.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/mmap.h \
- ../include/portable/time.h ../include/inn/fdflag.h \
- ../include/inn/defines.h ../include/portable/socket.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/portable/mmap.h \
+ ../include/inn/fdflag.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/inn/innconf.h ../include/inn/messages.h ../include/inn/mmap.h \
- ../include/inn/wire.h interface.h ../include/inn/storage.h \
- ../include/inn/options.h ../include/inn/libinn.h methods.h interface.h \
- ../include/inn/paths.h cnfs/cnfs.h cnfs/cnfs-private.h
+ ../include/inn/innconf.h ../include/inn/defines.h \
+ ../include/inn/messages.h ../include/inn/mmap.h ../include/inn/wire.h \
+ interface.h ../include/inn/storage.h ../include/inn/options.h \
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+ methods.h interface.h ../include/inn/paths.h cnfs/cnfs.h \
+ cnfs/cnfs-private.h
ovdb/ovdb.o: ovdb/ovdb.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/socket.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/portable/time.h ../include/conffile.h ../include/inn/fdflag.h \
- ../include/inn/defines.h ../include/inn/innconf.h \
- ../include/inn/libinn.h ../include/inn/messages.h \
- ../include/inn/newsuser.h ../include/inn/paths.h \
- ../include/inn/storage.h ../include/inn/options.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/history.h ovinterface.h \
- ovdb/ovdb.h ovdb/ovdb-private.h
+ ../include/conffile.h ../include/inn/fdflag.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+ ../include/inn/messages.h ../include/inn/newsuser.h \
+ ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
+ ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h \
+ ovinterface.h ovdb/ovdb.h ovdb/ovdb-private.h
timecaf/caf.o: timecaf/caf.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/messages.h ../include/inn/defines.h \
- ../include/inn/libinn.h timecaf/caf.h
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/messages.h \
+ ../include/inn/libinn.h ../include/inn/defines.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h timecaf/caf.h
timecaf/timecaf.o: timecaf/timecaf.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/portable/mmap.h timecaf/caf.h \
- ../include/inn/fdflag.h ../include/inn/defines.h \
- ../include/portable/socket.h ../include/portable/getaddrinfo.h \
- ../include/portable/getnameinfo.h ../include/inn/innconf.h \
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/portable/mmap.h timecaf/caf.h \
+ ../include/inn/fdflag.h ../include/portable/socket.h \
+ ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
+ ../include/inn/innconf.h ../include/inn/defines.h \
../include/inn/messages.h ../include/inn/wire.h ../include/inn/libinn.h \
- methods.h interface.h ../include/inn/storage.h ../include/inn/options.h \
- timecaf/timecaf.h interface.h ../include/inn/paths.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/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/portable/mmap.h ../include/inn/innconf.h \
- ../include/inn/defines.h ../include/inn/messages.h ../include/inn/wire.h \
- ../include/inn/libinn.h methods.h interface.h ../include/inn/storage.h \
- ../include/inn/options.h ../include/inn/paths.h timehash/timehash.h \
- interface.h
+ ../include/inn/macros.h ../include/portable/mmap.h \
+ ../include/inn/innconf.h ../include/inn/defines.h \
+ ../include/inn/messages.h ../include/inn/wire.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h methods.h interface.h \
+ ../include/inn/storage.h ../include/inn/options.h ../include/inn/paths.h \
+ timehash/timehash.h interface.h
tradindexed/tdx-cache.o: tradindexed/tdx-cache.c ../include/config.h \
- ../include/inn/defines.h ../include/inn/system.h \
+ ../include/inn/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/hashtab.h ../include/inn/defines.h \
- ../include/inn/messages.h ../include/inn/libinn.h \
+ ../include/inn/macros.h ../include/inn/hashtab.h \
+ ../include/inn/defines.h ../include/inn/messages.h \
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
../include/inn/storage.h ../include/inn/options.h \
tradindexed/tdx-private.h
tradindexed/tdx-data.o: tradindexed/tdx-data.c ../include/config.h \
- ../include/inn/defines.h ../include/inn/system.h \
+ ../include/inn/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/portable/mmap.h ../include/inn/fdflag.h \
- ../include/inn/defines.h ../include/portable/socket.h \
+ ../include/inn/macros.h ../include/portable/mmap.h \
+ ../include/inn/fdflag.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/inn/history.h ../include/inn/innconf.h \
- ../include/inn/messages.h ../include/inn/mmap.h ../include/inn/libinn.h \
+ ../include/inn/history.h ../include/inn/defines.h \
+ ../include/inn/innconf.h ../include/inn/messages.h ../include/inn/mmap.h \
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
../include/inn/ov.h ../include/inn/storage.h ../include/inn/options.h \
ovinterface.h ../include/inn/storage.h tradindexed/tdx-private.h \
tradindexed/tdx-structure.h
tradindexed/tdx-group.o: tradindexed/tdx-group.c ../include/config.h \
- ../include/inn/defines.h ../include/inn/system.h \
+ ../include/inn/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/portable/mmap.h ../include/inn/fdflag.h \
- ../include/inn/defines.h ../include/portable/socket.h \
+ ../include/inn/macros.h ../include/portable/mmap.h \
+ ../include/inn/fdflag.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/inn/hashtab.h ../include/inn/innconf.h \
- ../include/inn/messages.h ../include/inn/mmap.h ../include/inn/qio.h \
- ../include/inn/vector.h ../include/inn/libinn.h ../include/inn/paths.h \
+ ../include/inn/hashtab.h ../include/inn/defines.h \
+ ../include/inn/innconf.h ../include/inn/messages.h ../include/inn/mmap.h \
+ ../include/inn/qio.h ../include/inn/vector.h ../include/inn/libinn.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/paths.h \
tradindexed/tdx-private.h ../include/inn/storage.h \
../include/inn/options.h tradindexed/tdx-structure.h
tradindexed/tradindexed.o: tradindexed/tradindexed.c ../include/config.h \
- ../include/inn/defines.h ../include/inn/system.h \
+ ../include/inn/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/innconf.h ../include/inn/defines.h \
- ../include/inn/messages.h ../include/inn/libinn.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/options.h \
+ ../include/inn/macros.h ../include/inn/innconf.h \
+ ../include/inn/defines.h ../include/inn/messages.h \
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+ ../include/inn/ov.h ../include/inn/storage.h ../include/inn/options.h \
../include/inn/history.h ../include/inn/storage.h \
tradindexed/tdx-private.h tradindexed/tdx-structure.h \
tradindexed/tradindexed.h
tradspool/tradspool.o: tradspool/tradspool.c ../include/config.h \
- ../include/inn/defines.h ../include/inn/system.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/portable/mmap.h ../include/inn/innconf.h \
- ../include/inn/defines.h ../include/inn/messages.h ../include/inn/qio.h \
- ../include/inn/wire.h ../include/inn/libinn.h ../include/inn/paths.h \
- methods.h interface.h ../include/inn/storage.h ../include/inn/options.h \
- tradspool/tradspool.h interface.h
+ ../include/inn/macros.h ../include/portable/mmap.h \
+ ../include/inn/innconf.h ../include/inn/defines.h \
+ ../include/inn/messages.h ../include/inn/qio.h ../include/inn/wire.h \
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+ ../include/inn/paths.h methods.h interface.h ../include/inn/storage.h \
+ ../include/inn/options.h tradspool/tradspool.h interface.h
trash/trash.o: trash/trash.c ../include/config.h ../include/inn/defines.h \
- ../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/libinn.h ../include/inn/defines.h \
- methods.h interface.h ../include/inn/storage.h ../include/inn/options.h \
- trash/trash.h interface.h
+ ../include/inn/system.h ../include/inn/macros.h \
+ ../include/portable/macros.h ../include/portable/stdbool.h \
+ ../include/inn/options.h ../include/clibrary.h ../include/config.h \
+ ../include/inn/macros.h ../include/inn/libinn.h ../include/inn/defines.h \
+ ../include/inn/xmalloc.h ../include/inn/xwrite.h methods.h interface.h \
+ ../include/inn/storage.h ../include/inn/options.h trash/trash.h \
+ interface.h
tradindexed/tdx-util.o: tradindexed/tdx-util.c ../include/config.h \
- ../include/inn/defines.h ../include/inn/system.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/buffer.h ../include/inn/defines.h ../include/inn/libinn.h \
- ../include/inn/history.h ../include/inn/innconf.h \
- ../include/inn/messages.h ../include/inn/newsuser.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/options.h ../include/inn/paths.h \
- ../include/inn/vector.h ../include/inn/wire.h ovinterface.h \
- ../include/inn/storage.h tradindexed/tdx-private.h \
- tradindexed/tdx-structure.h
+ ../include/inn/macros.h ../include/inn/buffer.h ../include/inn/libinn.h \
+ ../include/inn/defines.h ../include/inn/xmalloc.h \
+ ../include/inn/xwrite.h ../include/inn/history.h \
+ ../include/inn/innconf.h ../include/inn/messages.h \
+ ../include/inn/newsuser.h ../include/inn/ov.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/paths.h ../include/inn/vector.h \
+ ../include/inn/wire.h ovinterface.h ../include/inn/storage.h \
+ tradindexed/tdx-private.h tradindexed/tdx-structure.h
Modified: storage/cnfs/cnfs.c
===================================================================
--- storage/cnfs/cnfs.c 2014-09-17 20:55:11 UTC (rev 9694)
+++ storage/cnfs/cnfs.c 2014-09-20 05:53:22 UTC (rev 9695)
@@ -6,7 +6,6 @@
#include "config.h"
#include "clibrary.h"
#include "portable/mmap.h"
-#include "portable/time.h"
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
@@ -17,6 +16,11 @@
#include <sys/stat.h>
#include <sys/uio.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+
#include "inn/fdflag.h"
#include "inn/innconf.h"
#include "inn/messages.h"
Modified: storage/ovdb/ovdb.c
===================================================================
--- storage/ovdb/ovdb.c 2014-09-17 20:55:11 UTC (rev 9694)
+++ storage/ovdb/ovdb.c 2014-09-20 05:53:22 UTC (rev 9695)
@@ -73,7 +73,6 @@
#include "config.h"
#include "clibrary.h"
#include "portable/socket.h"
-#include "portable/time.h"
#include <errno.h>
#include <fcntl.h>
#ifdef HAVE_LIMITS_H
@@ -89,6 +88,11 @@
# define COMPRESS_MIN 600
#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+
#include "conffile.h"
#include "inn/fdflag.h"
#include "inn/innconf.h"
Modified: tests/lib/xmalloc.c
===================================================================
--- tests/lib/xmalloc.c 2014-09-17 20:55:11 UTC (rev 9694)
+++ tests/lib/xmalloc.c 2014-09-20 05:53:22 UTC (rev 9695)
@@ -37,7 +37,7 @@
#include <ctype.h>
#include <errno.h>
-#include "portable/time.h"
+#include <sys/time.h>
/* Linux requires sys/time.h be included before sys/resource.h. */
#include <sys/resource.h>
Modified: tests/tap/process.c
===================================================================
--- tests/tap/process.c 2014-09-17 20:55:11 UTC (rev 9694)
+++ tests/tap/process.c 2014-09-20 05:53:22 UTC (rev 9695)
@@ -50,7 +50,7 @@
# include <sys/select.h>
#endif
#include <sys/stat.h>
-#include "portable/time.h"
+#include <sys/time.h>
#include "portable/wait.h"
#include "tap/basic.h"
More information about the inn-committers
mailing list