Patch: include/paths.h --> include/inn/paths.h in inn-STABLE
Adam J. Richter
adam at yggdrasil.com
Sun Nov 19 09:35:31 UTC 2006
[]
[Resending with the patch in the message body instead of a
MIME attachment so that the mail transfer agent or mail list software
at isc.org does not remove it. --Adam]
On Sun, Nov 19, 2006 at 05:13:36PM +0800, I wrote:
[...]
> This patch to inn-CURRENT moves include/paths.h to
> include/inn/paths.h to avoid conflicts with glibc. [...]
> I will also post a version of this patch against
> inn-STABLE-20061118 in a separate message to make it easier to
> extract the patches separately.
Here is the version of the patch for inn-STABLE-20061118.
Adam Richter
diff -u -r inn-STABLE-20061118/HACKING inn-STABLE/HACKING
--- inn-STABLE-20061118/HACKING 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/HACKING 2006-11-19 15:35:36.000000000 +0800
@@ -362,7 +362,7 @@
generally always be used instead of the regular C versions. libinn.h
also provides various other utility functions that are frequently used.
- paths.h includes a wide variety of paths determined at configure time,
+ inn/paths.h includes a wide variety of paths determined at configure time,
both default paths to various parts of INN and paths to programs. Don't
just use the default paths, though, if they're also configurable in
inn.conf; instead, call ReadInnConf() and use the global innconf
diff -u -r inn-STABLE-20061118/MANIFEST inn-STABLE/MANIFEST
--- inn-STABLE-20061118/MANIFEST 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/MANIFEST 2006-11-19 15:35:36.000000000 +0800
@@ -381,7 +381,7 @@
include/libinn.h INN library declarations
include/nntp.h NNTP command and reply codes
include/ov.h Header file for overview
-include/paths.h.in Paths to common programs and files
+include/inn/paths.h.in Paths to common programs and files
include/portable Portability wrappers (Directory)
include/portable/mmap.h Wrapper for <sys/mman.h>
include/portable/setproctitle.h Portable setup for setproctitle
diff -u -r inn-STABLE-20061118/Makefile.global.in inn-STABLE/Makefile.global.in
--- inn-STABLE-20061118/Makefile.global.in 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/Makefile.global.in 2006-11-19 15:35:36.000000000 +0800
@@ -164,7 +164,7 @@
## Changes to this file will *not* be reflected in the paths compiled into
## programs; these paths are only used during the build process and for
## some autogenerated scripts. To change the compiled paths, see
-## include/paths.h. You may also need to modify scripts/innshellvars*.
+## include/inn/paths.h. You may also need to modify scripts/innshellvars*.
AWK = @_PATH_AWK@
COMPRESS = @COMPRESS@
diff -u -r inn-STABLE-20061118/TODO inn-STABLE/TODO
--- inn-STABLE-20061118/TODO 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/TODO 2006-11-19 16:35:03.000000000 +0800
@@ -240,11 +240,10 @@
directive or a command-line option. In particular, the rnews
configuration should probably be an rnews-specific section of inn.conf.
-* Move include/paths.h to include/inn/paths.h and change _PATH as a prefix
- to INN_PATH to move the identifiers out of the C reserved namespace.
- Check to be sure we still need all of the #defines and look at adding
- anything needed by innfeed (and eliminating the separate innfeed header
- serving the same purpose).
+* Change _PATH as a prefix to INN_PATH to move the identifiers out of
+ the C reserved namespace. Check to be sure we still need all of the
+ #defines and look at adding anything needed by innfeed (and eliminating
+ the separate innfeed header serving the same purpose).
* Move include/nntp.h to include/inn/nntp.h and at the same time look at
standardizing the names of all of the #defines it provides, including
diff -u -r inn-STABLE-20061118/authprogs/Makefile inn-STABLE/authprogs/Makefile
--- inn-STABLE-20061118/authprogs/Makefile 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/authprogs/Makefile 2006-11-19 15:35:35.000000000 +0800
@@ -105,5 +105,5 @@
../include/clibrary.h ../include/portable/time.h \
../include/inn/innconf.h ../include/inn/md5.h \
../include/inn/messages.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h ../include/conffile.h libauth.h \
+ ../include/inn/paths.h ../include/conffile.h libauth.h \
../include/portable/socket.h
diff -u -r inn-STABLE-20061118/authprogs/radius.c inn-STABLE/authprogs/radius.c
--- inn-STABLE-20061118/authprogs/radius.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/authprogs/radius.c 2006-11-19 15:35:35.000000000 +0800
@@ -22,7 +22,7 @@
#include "inn/messages.h"
#include "libinn.h"
#include "nntp.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "conffile.h"
#include "libauth.h"
diff -u -r inn-STABLE-20061118/backends/Makefile inn-STABLE/backends/Makefile
--- inn-STABLE-20061118/backends/Makefile 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/backends/Makefile 2006-11-19 15:35:35.000000000 +0800
@@ -108,32 +108,32 @@
actsync.o: actsync.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/portable/wait.h \
../include/inn/innconf.h ../include/inn/messages.h \
- ../include/inn/qio.h ../include/libinn.h ../include/paths.h
+ ../include/inn/qio.h ../include/libinn.h ../include/inn/paths.h
archive.o: archive.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h \
../include/inn/messages.h ../include/inn/wire.h ../include/libinn.h \
- ../include/paths.h ../include/storage.h
+ ../include/inn/paths.h ../include/storage.h
batcher.o: batcher.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h \
- ../include/inn/messages.h ../include/libinn.h ../include/paths.h \
+ ../include/inn/messages.h ../include/libinn.h ../include/inn/paths.h \
../include/storage.h
buffchan.o: buffchan.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h \
../include/inn/messages.h ../include/inn/qio.h ../include/libinn.h \
- ../include/paths.h map.h
+ ../include/inn/paths.h map.h
cvtbatch.o: cvtbatch.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h \
../include/inn/messages.h ../include/inn/qio.h ../include/inn/wire.h \
- ../include/libinn.h ../include/paths.h ../include/storage.h
+ ../include/libinn.h ../include/inn/paths.h ../include/storage.h
filechan.o: filechan.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h \
- ../include/inn/messages.h ../include/libinn.h ../include/paths.h \
+ ../include/inn/messages.h ../include/libinn.h ../include/inn/paths.h \
map.h
inndf.o: inndf.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h \
../include/inn/messages.h ../include/inn/qio.h ../include/libinn.h \
../include/ov.h ../include/storage.h ../include/inn/history.h \
- ../include/paths.h
+ ../include/inn/paths.h
innxbatch.o: innxbatch.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/portable/socket.h \
../include/portable/time.h ../include/inn/innconf.h \
@@ -143,22 +143,22 @@
../include/portable/time.h ../include/inn/history.h \
../include/inn/innconf.h ../include/inn/messages.h \
../include/inn/qio.h ../include/inn/timer.h ../include/inn/wire.h \
- ../include/libinn.h ../include/nntp.h ../include/paths.h \
+ ../include/libinn.h ../include/nntp.h ../include/inn/paths.h \
../include/storage.h
map.o: map.c ../include/config.h ../include/inn/defines.h \
- ../include/clibrary.h ../include/libinn.h ../include/paths.h map.h
+ ../include/clibrary.h ../include/libinn.h ../include/inn/paths.h map.h
ninpaths.o: ninpaths.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h
nntpget.o: nntpget.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/portable/socket.h \
../include/portable/time.h ../include/inn/history.h \
../include/inn/innconf.h ../include/inn/messages.h \
- ../include/libinn.h ../include/nntp.h ../include/paths.h
+ ../include/libinn.h ../include/nntp.h ../include/inn/paths.h
overchan.o: overchan.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/portable/time.h \
../include/inn/innconf.h ../include/inn/messages.h \
../include/inn/qio.h ../include/libinn.h ../include/ov.h \
- ../include/storage.h ../include/inn/history.h ../include/paths.h
+ ../include/storage.h ../include/inn/history.h ../include/inn/paths.h
shlock.o: shlock.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/messages.h
shrinkfile.o: shrinkfile.c ../include/config.h \
diff -u -r inn-STABLE-20061118/backends/actsync.c inn-STABLE/backends/actsync.c
--- inn-STABLE-20061118/backends/actsync.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/backends/actsync.c 2006-11-19 15:35:35.000000000 +0800
@@ -72,7 +72,7 @@
#include "inn/messages.h"
#include "inn/qio.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
static const char usage[] = "\
Usage: actsync [-A][-b hostid][-d hostid][-i ignore_file][-I hostid][-k]\n\
diff -u -r inn-STABLE-20061118/backends/archive.c inn-STABLE/backends/archive.c
--- inn-STABLE-20061118/backends/archive.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/backends/archive.c 2006-11-19 15:35:35.000000000 +0800
@@ -18,7 +18,7 @@
#include "inn/messages.h"
#include "inn/wire.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "storage.h"
diff -u -r inn-STABLE-20061118/backends/batcher.c inn-STABLE/backends/batcher.c
--- inn-STABLE-20061118/backends/batcher.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/backends/batcher.c 2006-11-19 15:35:35.000000000 +0800
@@ -16,7 +16,7 @@
#include "inn/messages.h"
#include "inn/timer.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "storage.h"
diff -u -r inn-STABLE-20061118/backends/buffchan.c inn-STABLE/backends/buffchan.c
--- inn-STABLE-20061118/backends/buffchan.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/backends/buffchan.c 2006-11-19 15:35:35.000000000 +0800
@@ -14,7 +14,7 @@
#include "inn/messages.h"
#include "inn/qio.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "map.h"
/*
diff -u -r inn-STABLE-20061118/backends/crosspost.c inn-STABLE/backends/crosspost.c
--- inn-STABLE-20061118/backends/crosspost.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/backends/crosspost.c 2006-11-19 15:35:35.000000000 +0800
@@ -23,7 +23,7 @@
#include "inn/qio.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
static char *Dir;
diff -u -r inn-STABLE-20061118/backends/cvtbatch.c inn-STABLE/backends/cvtbatch.c
--- inn-STABLE-20061118/backends/cvtbatch.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/backends/cvtbatch.c 2006-11-19 15:35:35.000000000 +0800
@@ -11,7 +11,7 @@
#include "inn/qio.h"
#include "inn/wire.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "storage.h"
diff -u -r inn-STABLE-20061118/backends/filechan.c inn-STABLE/backends/filechan.c
--- inn-STABLE-20061118/backends/filechan.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/backends/filechan.c 2006-11-19 15:35:35.000000000 +0800
@@ -13,7 +13,7 @@
#include "inn/innconf.h"
#include "inn/messages.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "map.h"
diff -u -r inn-STABLE-20061118/backends/inndf.c inn-STABLE/backends/inndf.c
--- inn-STABLE-20061118/backends/inndf.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/backends/inndf.c 2006-11-19 15:35:35.000000000 +0800
@@ -51,7 +51,7 @@
#include "inn/qio.h"
#include "libinn.h"
#include "ov.h"
-#include "paths.h"
+#include "inn/paths.h"
/* The portability mess. Hide everything in macros so that the actual code
is relatively clean. SysV uses statvfs, BSD uses statfs, and ULTRIX is
diff -u -r inn-STABLE-20061118/backends/innxmit.c inn-STABLE/backends/innxmit.c
--- inn-STABLE-20061118/backends/innxmit.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/backends/innxmit.c 2006-11-19 15:35:35.000000000 +0800
@@ -30,7 +30,7 @@
#include "inn/wire.h"
#include "libinn.h"
#include "nntp.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "storage.h"
#define OUTPUT_BUFFER_SIZE (16 * 1024)
diff -u -r inn-STABLE-20061118/backends/map.c inn-STABLE/backends/map.c
--- inn-STABLE-20061118/backends/map.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/backends/map.c 2006-11-19 15:35:35.000000000 +0800
@@ -7,7 +7,7 @@
#include <errno.h>
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "map.h"
diff -u -r inn-STABLE-20061118/backends/nntpget.c inn-STABLE/backends/nntpget.c
--- inn-STABLE-20061118/backends/nntpget.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/backends/nntpget.c 2006-11-19 15:35:35.000000000 +0800
@@ -23,7 +23,7 @@
#include "inn/messages.h"
#include "libinn.h"
#include "nntp.h"
-#include "paths.h"
+#include "inn/paths.h"
/*
** All information about a site we are connected to.
diff -u -r inn-STABLE-20061118/backends/overchan.c inn-STABLE/backends/overchan.c
--- inn-STABLE-20061118/backends/overchan.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/backends/overchan.c 2006-11-19 15:35:35.000000000 +0800
@@ -15,7 +15,7 @@
#include "inn/qio.h"
#include "libinn.h"
#include "ov.h"
-#include "paths.h"
+#include "inn/paths.h"
unsigned int NumArts;
unsigned int StartTime;
diff -u -r inn-STABLE-20061118/configure inn-STABLE/configure
--- inn-STABLE-20061118/configure 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/configure 2006-11-19 15:35:36.000000000 +0800
@@ -11500,7 +11500,7 @@
ac_given_srcdir=$srcdir
trap 'rm -fr `echo "Makefile.global
- include/paths.h
+ include/inn/paths.h
samples/inn.conf
samples/innreport.conf
samples/newsfeeds
@@ -11683,7 +11683,7 @@
cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"Makefile.global
- include/paths.h
+ include/inn/paths.h
samples/inn.conf
samples/innreport.conf
samples/newsfeeds
@@ -11876,7 +11876,7 @@
Makefile.global
include/config.h
- include/paths.h
+ include/inn/paths.h
innfeed/innfeed.h
EOM
diff -u -r inn-STABLE-20061118/configure.in inn-STABLE/configure.in
--- inn-STABLE-20061118/configure.in 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/configure.in 2006-11-19 15:35:36.000000000 +0800
@@ -1828,7 +1828,7 @@
AC_CONFIG_HEADER(include/config.h)
AC_OUTPUT(
Makefile.global
- include/paths.h
+ include/inn/paths.h
samples/inn.conf
samples/innreport.conf
samples/newsfeeds
@@ -1851,7 +1851,7 @@
Makefile.global
include/config.h
- include/paths.h
+ include/inn/paths.h
innfeed/innfeed.h
EOM
diff -u -r inn-STABLE-20061118/contrib/respool.c inn-STABLE/contrib/respool.c
--- inn-STABLE-20061118/contrib/respool.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/contrib/respool.c 2006-11-19 15:35:35.000000000 +0800
@@ -15,7 +15,7 @@
#include "inn/innconf.h"
#include "inn/qio.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "storage.h"
char *ME;
diff -u -r inn-STABLE-20061118/doc/hook-perl inn-STABLE/doc/hook-perl
--- inn-STABLE-20061118/doc/hook-perl 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/doc/hook-perl 2006-11-19 15:35:35.000000000 +0800
@@ -30,8 +30,8 @@
The innd Perl Filter
When innd starts, it first loads the file _PATH_PERL_STARTUP_INND
- (defined in include/paths.h, by default startup_innd.pl) and then loads
- the file _PATH_PERL_FILTER_INND (also defined in include/paths.h, by
+ (defined in include/inn/paths.h, by default startup_innd.pl) and then loads
+ the file _PATH_PERL_FILTER_INND (also defined in include/inn/paths.h, by
default filter_innd.pl). Both of these files must be located in the
directory specified by pathfilter in inn.conf
(/usr/local/news/bin/filter by default). The default directory for
@@ -265,7 +265,7 @@
The nnrpd Posting Filter
Whenever Perl support is needed in nnrpd, it first loads the file
- _PATH_PERL_FILTER_NNRPD (defined in include/paths.h, by default
+ _PATH_PERL_FILTER_NNRPD (defined in include/inn/paths.h, by default
filter_nnrpd.pl). This file must be located in the directory specified
by pathfilter in inn.conf (/usr/local/news/bin/filter by default). The
default directory for filter code can be specified at configure time by
diff -u -r inn-STABLE-20061118/doc/man/rnews.1 inn-STABLE/doc/man/rnews.1
--- inn-STABLE-20061118/doc/man/rnews.1 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/doc/man/rnews.1 2006-11-19 15:35:35.000000000 +0800
@@ -91,7 +91,7 @@
for each article offered to the server.
Logging will only be done if the value is not an empty string.
If ``\fB\-h\fP'' is not set, the environment variable
-.I <_ENV_UUCPHOST in include/paths.h>
+.I <_ENV_UUCPHOST in include/inn/paths.h>
(typically
.IR $UU_MACHINE )
will be examined for a similar string.
diff -u -r inn-STABLE-20061118/doc/pod/hacking.pod inn-STABLE/doc/pod/hacking.pod
--- inn-STABLE-20061118/doc/pod/hacking.pod 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/doc/pod/hacking.pod 2006-11-19 15:35:35.000000000 +0800
@@ -355,7 +355,7 @@
be used instead of the regular C versions. F<libinn.h> also provides
various other utility functions that are frequently used.
-F<paths.h> includes a wide variety of paths determined at configure time,
+F<inn/paths.h> includes a wide variety of paths determined at configure time,
both default paths to various parts of INN and paths to programs. Don't
just use the default paths, though, if they're also configurable in
F<inn.conf>; instead, call ReadInnConf() and use the global innconf
diff -u -r inn-STABLE-20061118/doc/pod/hook-perl.pod inn-STABLE/doc/pod/hook-perl.pod
--- inn-STABLE-20061118/doc/pod/hook-perl.pod 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/doc/pod/hook-perl.pod 2006-11-19 15:35:35.000000000 +0800
@@ -30,8 +30,8 @@
=head1 The innd Perl Filter
When innd starts, it first loads the file _PATH_PERL_STARTUP_INND (defined
-in F<include/paths.h>, by default F<startup_innd.pl>) and then loads the
-file _PATH_PERL_FILTER_INND (also defined in F<include/paths.h>, by
+in F<include/inn/paths.h>, by default F<startup_innd.pl>) and then loads the
+file _PATH_PERL_FILTER_INND (also defined in F<include/inn/paths.h>, by
default F<filter_innd.pl>). Both of these files must be located in the
directory specified by pathfilter in F<inn.conf>
(F</usr/local/news/bin/filter> by default). The default directory for
@@ -277,7 +277,7 @@
=head1 The nnrpd Posting Filter
Whenever Perl support is needed in nnrpd, it first loads the file
-_PATH_PERL_FILTER_NNRPD (defined in F<include/paths.h>, by default
+_PATH_PERL_FILTER_NNRPD (defined in F<include/inn/paths.h>, by default
F<filter_nnrpd.pl>). This file must be located in the directory
specified by pathfilter in F<inn.conf> (F</usr/local/news/bin/filter>
by default). The default directory for filter code can be specified
diff -u -r inn-STABLE-20061118/expire/Makefile inn-STABLE/expire/Makefile
--- inn-STABLE-20061118/expire/Makefile 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/expire/Makefile 2006-11-19 15:35:35.000000000 +0800
@@ -91,13 +91,13 @@
expire.o: expire.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/history.h \
../include/inn/innconf.h ../include/inn/messages.h \
- ../include/inndcomm.h ../include/libinn.h ../include/paths.h \
+ ../include/inndcomm.h ../include/libinn.h ../include/inn/paths.h \
../include/storage.h
expireover.o: expireover.c ../include/config.h \
../include/inn/defines.h ../include/clibrary.h \
../include/inn/innconf.h ../include/inn/messages.h \
../include/inn/qio.h ../include/libinn.h ../include/ov.h \
- ../include/storage.h ../include/inn/history.h ../include/paths.h
+ ../include/storage.h ../include/inn/history.h ../include/inn/paths.h
fastrm.o: fastrm.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h \
../include/inn/messages.h ../include/inn/qio.h ../include/libinn.h \
@@ -105,19 +105,19 @@
grephistory.o: grephistory.c ../include/clibrary.h ../include/config.h \
../include/inn/defines.h ../include/inn/history.h \
../include/inn/innconf.h ../include/inn/messages.h \
- ../include/libinn.h ../include/paths.h ../include/storage.h
+ ../include/libinn.h ../include/inn/paths.h ../include/storage.h
makedbz.o: makedbz.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/dbz.h ../include/libinn.h \
../include/inn/innconf.h ../include/inn/messages.h \
- ../include/inn/qio.h ../include/paths.h ../include/storage.h
+ ../include/inn/qio.h ../include/inn/paths.h ../include/storage.h
makehistory.o: makehistory.c ../include/config.h \
../include/inn/defines.h ../include/clibrary.h \
../include/portable/wait.h ../include/inn/buffer.h \
../include/inn/history.h ../include/inn/innconf.h \
../include/inn/messages.h ../include/inn/qio.h ../include/inn/wire.h \
../include/libinn.h ../include/ov.h ../include/storage.h \
- ../include/paths.h
+ ../include/inn/paths.h
prunehistory.o: prunehistory.c ../include/config.h \
../include/inn/defines.h ../include/clibrary.h \
../include/inn/history.h ../include/inn/innconf.h \
- ../include/inn/messages.h ../include/libinn.h ../include/paths.h
+ ../include/inn/messages.h ../include/libinn.h ../include/inn/paths.h
diff -u -r inn-STABLE-20061118/expire/expire.c inn-STABLE/expire/expire.c
--- inn-STABLE-20061118/expire/expire.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/expire/expire.c 2006-11-19 15:35:35.000000000 +0800
@@ -17,7 +17,7 @@
#include "inn/messages.h"
#include "inndcomm.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "storage.h"
diff -u -r inn-STABLE-20061118/expire/expireover.c inn-STABLE/expire/expireover.c
--- inn-STABLE-20061118/expire/expireover.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/expire/expireover.c 2006-11-19 15:35:35.000000000 +0800
@@ -21,7 +21,7 @@
#include "inn/qio.h"
#include "libinn.h"
#include "ov.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "storage.h"
static const char usage[] = "\
diff -u -r inn-STABLE-20061118/expire/grephistory.c inn-STABLE/expire/grephistory.c
--- inn-STABLE-20061118/expire/grephistory.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/expire/grephistory.c 2006-11-19 15:35:35.000000000 +0800
@@ -11,7 +11,7 @@
#include "inn/innconf.h"
#include "inn/messages.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "storage.h"
/*
diff -u -r inn-STABLE-20061118/expire/makedbz.c inn-STABLE/expire/makedbz.c
--- inn-STABLE-20061118/expire/makedbz.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/expire/makedbz.c 2006-11-19 15:35:35.000000000 +0800
@@ -14,7 +14,7 @@
#include "inn/messages.h"
#include "inn/qio.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "storage.h"
/* FIXME: once we figure out how to integrate this stuff with the
diff -u -r inn-STABLE-20061118/expire/makehistory.c inn-STABLE/expire/makehistory.c
--- inn-STABLE-20061118/expire/makehistory.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/expire/makehistory.c 2006-11-19 15:35:35.000000000 +0800
@@ -19,7 +19,7 @@
#include "inn/wire.h"
#include "libinn.h"
#include "ov.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "storage.h"
static const char usage[] = "\
diff -u -r inn-STABLE-20061118/expire/prunehistory.c inn-STABLE/expire/prunehistory.c
--- inn-STABLE-20061118/expire/prunehistory.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/expire/prunehistory.c 2006-11-19 15:35:35.000000000 +0800
@@ -12,7 +12,7 @@
#include "inn/innconf.h"
#include "inn/messages.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
/*
diff -u -r inn-STABLE-20061118/frontends/Makefile inn-STABLE/frontends/Makefile
--- inn-STABLE-20061118/frontends/Makefile 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/frontends/Makefile 2006-11-19 15:35:35.000000000 +0800
@@ -122,7 +122,7 @@
ctlinnd.o: ctlinnd.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h \
../include/inn/messages.h ../include/inndcomm.h ../include/libinn.h \
- ../include/paths.h
+ ../include/inn/paths.h
decode.o: decode.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/messages.h
encode.o: encode.c ../include/config.h ../include/inn/defines.h \
@@ -130,11 +130,11 @@
getlist.o: getlist.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h \
../include/inn/messages.h ../include/inn/qio.h ../include/libinn.h \
- ../include/paths.h
+ ../include/inn/paths.h
inews.o: inews.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/portable/time.h \
../include/inn/innconf.h ../include/inn/messages.h \
- ../include/libinn.h ../include/nntp.h ../include/paths.h
+ ../include/libinn.h ../include/nntp.h ../include/inn/paths.h
innconfval.o: innconfval.c ../include/config.h \
../include/inn/defines.h ../include/clibrary.h \
../include/inn/innconf.h ../include/inn/messages.h \
@@ -156,19 +156,19 @@
../include/portable/mmap.h ../include/portable/time.h \
../include/portable/setproctitle.h ../include/portable/socket.h \
../include/portable/wait.h ../include/inn/innconf.h \
- ../include/inn/messages.h ../include/libinn.h ../include/paths.h \
+ ../include/inn/messages.h ../include/libinn.h ../include/inn/paths.h \
../include/storage.h ../include/ov.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/clibrary.h ../include/inn/innconf.h \
../include/inn/messages.h ../include/libinn.h ../include/ov.h \
- ../include/storage.h ../include/inn/history.h ../include/paths.h \
+ ../include/storage.h ../include/inn/history.h ../include/inn/paths.h \
../storage/ovdb/ovdb.h ../storage/ovdb/ovdb-private.h
rnews.o: rnews.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/portable/wait.h \
../include/inn/innconf.h ../include/inn/messages.h \
../include/inn/wire.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h ../include/storage.h
+ ../include/inn/paths.h ../include/storage.h
sm.o: sm.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h \
../include/inn/messages.h ../include/inn/qio.h ../include/storage.h
diff -u -r inn-STABLE-20061118/frontends/ctlinnd.c inn-STABLE/frontends/ctlinnd.c
--- inn-STABLE-20061118/frontends/ctlinnd.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/frontends/ctlinnd.c 2006-11-19 15:35:35.000000000 +0800
@@ -13,7 +13,7 @@
#include "inn/messages.h"
#include "inndcomm.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
/*
diff -u -r inn-STABLE-20061118/frontends/getlist.c inn-STABLE/frontends/getlist.c
--- inn-STABLE-20061118/frontends/getlist.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/frontends/getlist.c 2006-11-19 15:35:35.000000000 +0800
@@ -11,7 +11,7 @@
#include "inn/messages.h"
#include "inn/qio.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
/*
diff -u -r inn-STABLE-20061118/frontends/inews.c inn-STABLE/frontends/inews.c
--- inn-STABLE-20061118/frontends/inews.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/frontends/inews.c 2006-11-19 15:35:35.000000000 +0800
@@ -18,7 +18,7 @@
#include "inn/messages.h"
#include "libinn.h"
#include "nntp.h"
-#include "paths.h"
+#include "inn/paths.h"
/* Signature handling. The separator will be appended before the signature,
and at most SIG_MAXLINES will be appended. */
diff -u -r inn-STABLE-20061118/frontends/ovdb_server.c inn-STABLE/frontends/ovdb_server.c
--- inn-STABLE-20061118/frontends/ovdb_server.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/frontends/ovdb_server.c 2006-11-19 15:35:35.000000000 +0800
@@ -25,7 +25,7 @@
#include "inn/innconf.h"
#include "inn/messages.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "storage.h"
#include "ov.h"
diff -u -r inn-STABLE-20061118/frontends/ovdb_stat.c inn-STABLE/frontends/ovdb_stat.c
--- inn-STABLE-20061118/frontends/ovdb_stat.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/frontends/ovdb_stat.c 2006-11-19 15:35:35.000000000 +0800
@@ -14,7 +14,7 @@
#include "inn/messages.h"
#include "libinn.h"
#include "ov.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "storage.h"
#include "../storage/ovdb/ovdb.h"
diff -u -r inn-STABLE-20061118/frontends/rnews.c inn-STABLE/frontends/rnews.c
--- inn-STABLE-20061118/frontends/rnews.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/frontends/rnews.c 2006-11-19 15:35:35.000000000 +0800
@@ -23,7 +23,7 @@
#include "inn/wire.h"
#include "libinn.h"
#include "nntp.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "storage.h"
diff -u -r inn-STABLE-20061118/include/Makefile inn-STABLE/include/Makefile
--- inn-STABLE-20061118/include/Makefile 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/include/Makefile 2006-11-19 15:35:35.000000000 +0800
@@ -10,10 +10,10 @@
ALL = inn/system.h inn/version.h
-EXTRA = config.h paths.h
+EXTRA = config.h inn/paths.h
PUBLIC = config.h conffile.h dbz.h inndcomm.h libinn.h nntp.h ov.h \
- paths.h storage.h
+ inn/paths.h storage.h
all: $(ALL) $(EXTRA)
Only in inn-STABLE/include/inn: paths.h.in
Only in inn-STABLE-20061118/include: paths.h.in
diff -u -r inn-STABLE-20061118/innd/Makefile inn-STABLE/innd/Makefile
--- inn-STABLE-20061118/innd/Makefile 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/innd/Makefile 2006-11-19 15:35:35.000000000 +0800
@@ -92,123 +92,123 @@
innd.h ../include/portable/time.h ../include/portable/socket.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/libinn.h \
- ../include/nntp.h ../include/paths.h ../include/storage.h \
+ ../include/nntp.h ../include/inn/paths.h ../include/storage.h \
../include/ov.h
cc.o: cc.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h ../include/inn/qio.h \
innd.h ../include/portable/time.h ../include/portable/socket.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/libinn.h \
- ../include/nntp.h ../include/paths.h ../include/storage.h \
+ ../include/nntp.h ../include/inn/paths.h ../include/storage.h \
../include/inndcomm.h ../include/innperl.h
chan.o: chan.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h innd.h \
../include/portable/time.h ../include/portable/socket.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/libinn.h \
- ../include/nntp.h ../include/paths.h ../include/storage.h
+ ../include/nntp.h ../include/inn/paths.h ../include/storage.h
icd.o: icd.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/portable/mmap.h \
../include/inn/innconf.h innd.h ../include/portable/time.h \
../include/portable/socket.h ../include/inn/buffer.h \
../include/inn/history.h ../include/inn/messages.h \
../include/inn/timer.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h ../include/storage.h ../include/ov.h
+ ../include/inn/paths.h ../include/storage.h ../include/ov.h
innd.o: innd.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h \
../include/inn/messages.h ../include/innperl.h innd.h \
../include/portable/time.h ../include/portable/socket.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/timer.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h ../include/storage.h ../include/ov.h
+ ../include/inn/paths.h ../include/storage.h ../include/ov.h
inndstart.o: inndstart.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/portable/socket.h \
../include/inn/innconf.h ../include/inn/messages.h \
- ../include/libinn.h ../include/paths.h
+ ../include/libinn.h ../include/inn/paths.h
keywords.o: keywords.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/libinn.h ../include/inn/innconf.h \
innd.h ../include/portable/time.h ../include/portable/socket.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/nntp.h \
- ../include/paths.h ../include/storage.h
+ ../include/inn/paths.h ../include/storage.h
lc.o: lc.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h innd.h \
../include/portable/time.h ../include/portable/socket.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/libinn.h \
- ../include/nntp.h ../include/paths.h ../include/storage.h
+ ../include/nntp.h ../include/inn/paths.h ../include/storage.h
nc.o: nc.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h innd.h \
../include/portable/time.h ../include/portable/socket.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/libinn.h \
- ../include/nntp.h ../include/paths.h ../include/storage.h
+ ../include/nntp.h ../include/inn/paths.h ../include/storage.h
newsfeeds.o: newsfeeds.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h innd.h \
../include/portable/time.h ../include/portable/socket.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/libinn.h \
- ../include/nntp.h ../include/paths.h ../include/storage.h
+ ../include/nntp.h ../include/inn/paths.h ../include/storage.h
ng.o: ng.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h innd.h \
../include/portable/time.h ../include/portable/socket.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/libinn.h \
- ../include/nntp.h ../include/paths.h ../include/storage.h \
+ ../include/nntp.h ../include/inn/paths.h ../include/storage.h \
../include/ov.h
perl.o: perl.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h innd.h ../include/portable/time.h \
../include/portable/socket.h ../include/inn/buffer.h \
../include/inn/history.h ../include/inn/messages.h \
../include/inn/timer.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h ../include/storage.h ../include/ppport.h \
+ ../include/inn/paths.h ../include/storage.h ../include/ppport.h \
../include/innperl.h
proc.o: proc.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/portable/wait.h innd.h \
../include/portable/time.h ../include/portable/socket.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/libinn.h \
- ../include/nntp.h ../include/paths.h ../include/storage.h
+ ../include/nntp.h ../include/inn/paths.h ../include/storage.h
python.o: python.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h innd.h \
../include/portable/time.h ../include/portable/socket.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/libinn.h \
- ../include/nntp.h ../include/paths.h ../include/storage.h
+ ../include/nntp.h ../include/inn/paths.h ../include/storage.h
rc.o: rc.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h innd.h \
../include/portable/time.h ../include/portable/socket.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/libinn.h \
- ../include/nntp.h ../include/paths.h ../include/storage.h
+ ../include/nntp.h ../include/inn/paths.h ../include/storage.h
site.o: site.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h innd.h \
../include/portable/time.h ../include/portable/socket.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/libinn.h \
- ../include/nntp.h ../include/paths.h ../include/storage.h
+ ../include/nntp.h ../include/inn/paths.h ../include/storage.h
status.o: status.c ../include/clibrary.h ../include/config.h \
../include/inn/defines.h ../include/inn/innconf.h innd.h \
../include/portable/time.h ../include/portable/socket.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/libinn.h \
- ../include/nntp.h ../include/paths.h ../include/storage.h \
+ ../include/nntp.h ../include/inn/paths.h ../include/storage.h \
../include/innperl.h
tcl.o: tcl.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h innd.h \
../include/portable/time.h ../include/portable/socket.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/libinn.h \
- ../include/nntp.h ../include/paths.h ../include/storage.h
+ ../include/nntp.h ../include/inn/paths.h ../include/storage.h
util.o: util.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h ../include/libinn.h \
innd.h ../include/portable/time.h ../include/portable/socket.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/nntp.h \
- ../include/paths.h ../include/storage.h
+ ../include/inn/paths.h ../include/storage.h
wip.o: wip.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h innd.h \
../include/portable/time.h ../include/portable/socket.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h ../include/libinn.h \
- ../include/nntp.h ../include/paths.h ../include/storage.h
+ ../include/nntp.h ../include/inn/paths.h ../include/storage.h
diff -u -r inn-STABLE-20061118/innd/innd.h inn-STABLE/innd/innd.h
--- inn-STABLE-20061118/innd/innd.h 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/innd/innd.h 2006-11-19 15:35:35.000000000 +0800
@@ -43,7 +43,7 @@
#include "inn/timer.h"
#include "libinn.h"
#include "nntp.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "storage.h"
/* TCL defines EXTERN, so undef it after inclusion since we use it. */
diff -u -r inn-STABLE-20061118/innd/inndstart.c inn-STABLE/innd/inndstart.c
--- inn-STABLE-20061118/innd/inndstart.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/innd/inndstart.c 2006-11-19 15:35:35.000000000 +0800
@@ -57,7 +57,7 @@
#include "inn/innconf.h"
#include "inn/messages.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
/* Fake up a do-nothing setgroups for Cygwin. */
#if !HAVE_SETGROUPS
diff -u -r inn-STABLE-20061118/lib/Makefile inn-STABLE/lib/Makefile
--- inn-STABLE-20061118/lib/Makefile 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/lib/Makefile 2006-11-19 15:35:35.000000000 +0800
@@ -98,7 +98,7 @@
clientactive.o: clientactive.c ../include/config.h \
../include/inn/defines.h ../include/clibrary.h \
../include/inn/innconf.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h
+ ../include/inn/paths.h
clientlib.o: clientlib.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h ../include/libinn.h \
../include/nntp.h
@@ -119,7 +119,7 @@
../include/inn/innconf.h ../include/inn/mmap.h
defdist.o: defdist.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h ../include/libinn.h \
- ../include/paths.h
+ ../include/inn/paths.h
fdflags.o: fdflags.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/libinn.h
fdlimit.o: fdlimit.c ../include/config.h ../include/inn/defines.h \
@@ -127,11 +127,11 @@
genid.o: genid.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h ../include/libinn.h
getfqdn.o: getfqdn.c ../include/config.h ../include/inn/defines.h \
- ../include/clibrary.h ../include/libinn.h ../include/paths.h
+ ../include/clibrary.h ../include/libinn.h ../include/inn/paths.h
getmodaddr.o: getmodaddr.c ../include/config.h \
../include/inn/defines.h ../include/clibrary.h \
../include/inn/innconf.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h
+ ../include/inn/paths.h
gettime.o: gettime.c ../include/config.h ../include/inn/defines.h \
../include/libinn.h
hash.o: hash.c ../include/config.h ../include/inn/defines.h \
@@ -141,16 +141,16 @@
innconf.o: innconf.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/confparse.h \
../include/inn/innconf.h ../include/inn/messages.h \
- ../include/inn/vector.h ../include/libinn.h ../include/paths.h
+ ../include/inn/vector.h ../include/libinn.h ../include/inn/paths.h
inndcomm.o: inndcomm.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/portable/time.h \
../include/portable/socket.h ../include/inn/innconf.h \
- ../include/inndcomm.h ../include/libinn.h ../include/paths.h
+ ../include/inndcomm.h ../include/libinn.h ../include/inn/paths.h
list.o: list.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/list.h
localopen.o: localopen.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h ../include/libinn.h \
- ../include/nntp.h ../include/paths.h
+ ../include/nntp.h ../include/inn/paths.h
lockfile.o: lockfile.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/libinn.h
makedir.o: makedir.c ../include/config.h ../include/inn/defines.h \
@@ -173,7 +173,7 @@
remopen.o: remopen.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/portable/socket.h \
../include/inn/innconf.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h
+ ../include/inn/paths.h
reservedfd.o: reservedfd.c ../include/config.h \
../include/inn/defines.h ../include/clibrary.h ../include/libinn.h
resource.o: resource.c ../include/config.h ../include/inn/defines.h \
@@ -183,7 +183,7 @@
../include/nntp.h
sendpass.o: sendpass.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h ../include/libinn.h \
- ../include/nntp.h ../include/paths.h
+ ../include/nntp.h ../include/inn/paths.h
sequence.o: sequence.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/sequence.h
sockaddr.o: sockaddr.c ../include/config.h ../include/inn/defines.h \
diff -u -r inn-STABLE-20061118/lib/clientactive.c inn-STABLE/lib/clientactive.c
--- inn-STABLE-20061118/lib/clientactive.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/lib/clientactive.c 2006-11-19 15:35:35.000000000 +0800
@@ -9,7 +9,7 @@
#include "inn/innconf.h"
#include "libinn.h"
#include "nntp.h"
-#include "paths.h"
+#include "inn/paths.h"
static char *CApathname;
diff -u -r inn-STABLE-20061118/lib/defdist.c inn-STABLE/lib/defdist.c
--- inn-STABLE-20061118/lib/defdist.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/lib/defdist.c 2006-11-19 15:35:35.000000000 +0800
@@ -9,7 +9,7 @@
#include "inn/innconf.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
typedef struct _DDENTRY {
diff -u -r inn-STABLE-20061118/lib/getfqdn.c inn-STABLE/lib/getfqdn.c
--- inn-STABLE-20061118/lib/getfqdn.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/lib/getfqdn.c 2006-11-19 15:35:35.000000000 +0800
@@ -7,7 +7,7 @@
#include <netdb.h>
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
/*
diff -u -r inn-STABLE-20061118/lib/getmodaddr.c inn-STABLE/lib/getmodaddr.c
--- inn-STABLE-20061118/lib/getmodaddr.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/lib/getmodaddr.c 2006-11-19 15:35:36.000000000 +0800
@@ -9,7 +9,7 @@
#include "inn/innconf.h"
#include "libinn.h"
#include "nntp.h"
-#include "paths.h"
+#include "inn/paths.h"
static char *GMApathname = NULL;
diff -u -r inn-STABLE-20061118/lib/innconf.c inn-STABLE/lib/innconf.c
--- inn-STABLE-20061118/lib/innconf.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/lib/innconf.c 2006-11-19 15:35:36.000000000 +0800
@@ -32,7 +32,7 @@
#include "inn/messages.h"
#include "inn/vector.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
/* Instantiation of the global innconf variable. */
struct innconf *innconf = NULL;
diff -u -r inn-STABLE-20061118/lib/inndcomm.c inn-STABLE/lib/inndcomm.c
--- inn-STABLE-20061118/lib/inndcomm.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/lib/inndcomm.c 2006-11-19 15:35:36.000000000 +0800
@@ -25,7 +25,7 @@
#include "inn/innconf.h"
#include "inndcomm.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
static char *ICCsockname = NULL;
#ifdef HAVE_UNIX_DOMAIN_SOCKETS
diff -u -r inn-STABLE-20061118/lib/localopen.c inn-STABLE/lib/localopen.c
--- inn-STABLE-20061118/lib/localopen.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/lib/localopen.c 2006-11-19 15:35:36.000000000 +0800
@@ -10,7 +10,7 @@
#include "inn/innconf.h"
#include "libinn.h"
#include "nntp.h"
-#include "paths.h"
+#include "inn/paths.h"
#if HAVE_UNIX_DOMAIN_SOCKETS
# include <sys/un.h>
diff -u -r inn-STABLE-20061118/lib/remopen.c inn-STABLE/lib/remopen.c
--- inn-STABLE-20061118/lib/remopen.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/lib/remopen.c 2006-11-19 15:35:36.000000000 +0800
@@ -16,7 +16,7 @@
#include "inn/innconf.h"
#include "libinn.h"
#include "nntp.h"
-#include "paths.h"
+#include "inn/paths.h"
/*
** Open a connection to an NNTP server and create stdio FILE's for talking
diff -u -r inn-STABLE-20061118/lib/sendpass.c inn-STABLE/lib/sendpass.c
--- inn-STABLE-20061118/lib/sendpass.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/lib/sendpass.c 2006-11-19 15:35:36.000000000 +0800
@@ -10,7 +10,7 @@
#include "inn/innconf.h"
#include "libinn.h"
#include "nntp.h"
-#include "paths.h"
+#include "inn/paths.h"
/*
diff -u -r inn-STABLE-20061118/nnrpd/Makefile inn-STABLE/nnrpd/Makefile
--- inn-STABLE-20061118/nnrpd/Makefile 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/nnrpd/Makefile 2006-11-19 15:35:36.000000000 +0800
@@ -76,7 +76,7 @@
../include/inn/messages.h ../include/inn/wire.h nnrpd.h \
../include/portable/socket.h ../include/portable/time.h \
../include/inn/qio.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h ../include/storage.h ../include/inn/vector.h \
+ ../include/inn/paths.h ../include/storage.h ../include/inn/vector.h \
../include/inn/timer.h ../include/ov.h ../include/inn/history.h tls.h \
cache.h
cache.o: cache.c ../include/config.h ../include/inn/defines.h \
@@ -87,25 +87,25 @@
../include/clibrary.h ../include/inn/innconf.h nnrpd.h \
../include/portable/socket.h ../include/portable/time.h \
../include/inn/qio.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h ../include/storage.h ../include/inn/vector.h \
+ ../include/inn/paths.h ../include/storage.h ../include/inn/vector.h \
../include/inn/timer.h ../include/ov.h ../include/inn/history.h
commands.o: commands.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/portable/wait.h nnrpd.h \
../include/portable/socket.h ../include/portable/time.h \
../include/inn/qio.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h ../include/storage.h ../include/inn/vector.h \
+ ../include/inn/paths.h ../include/storage.h ../include/inn/vector.h \
../include/inn/timer.h ../include/ov.h ../include/inn/history.h \
../include/inn/innconf.h ../include/inn/messages.h
line.o: line.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/messages.h nnrpd.h \
../include/portable/socket.h ../include/portable/time.h \
../include/inn/qio.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h ../include/storage.h ../include/inn/vector.h \
+ ../include/inn/paths.h ../include/storage.h ../include/inn/vector.h \
../include/inn/timer.h
list.o: list.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h nnrpd.h ../include/portable/socket.h \
../include/portable/time.h ../include/inn/qio.h ../include/libinn.h \
- ../include/nntp.h ../include/paths.h ../include/storage.h \
+ ../include/nntp.h ../include/inn/paths.h ../include/storage.h \
../include/inn/vector.h ../include/inn/timer.h ../include/ov.h \
../include/inn/history.h ../include/inn/innconf.h \
../include/inn/messages.h
@@ -113,14 +113,14 @@
../include/clibrary.h ../include/inn/innconf.h nnrpd.h \
../include/portable/socket.h ../include/portable/time.h \
../include/inn/qio.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h ../include/storage.h ../include/inn/vector.h \
+ ../include/inn/paths.h ../include/storage.h ../include/inn/vector.h \
../include/inn/timer.h tls.h sasl_config.h
newnews.o: newnews.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h \
../include/inn/messages.h ../include/inn/wire.h nnrpd.h \
../include/portable/socket.h ../include/portable/time.h \
../include/inn/qio.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h ../include/storage.h ../include/inn/vector.h \
+ ../include/inn/paths.h ../include/storage.h ../include/inn/vector.h \
../include/inn/timer.h ../include/ov.h ../include/inn/history.h \
cache.h
nnrpd.o: nnrpd.c ../include/config.h ../include/inn/defines.h \
@@ -129,13 +129,13 @@
../include/inn/messages.h ../include/libinn.h ../include/ov.h \
../include/storage.h ../include/inn/history.h nnrpd.h \
../include/portable/socket.h ../include/portable/time.h \
- ../include/inn/qio.h ../include/nntp.h ../include/paths.h \
+ ../include/inn/qio.h ../include/nntp.h ../include/inn/paths.h \
../include/inn/vector.h ../include/inn/timer.h tls.h sasl_config.h
perl.o: perl.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h nnrpd.h \
../include/portable/socket.h ../include/portable/time.h \
../include/inn/qio.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h ../include/storage.h ../include/inn/vector.h \
+ ../include/inn/paths.h ../include/storage.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 \
@@ -143,35 +143,35 @@
../include/conffile.h ../include/inn/innconf.h ../include/innperl.h \
nnrpd.h ../include/portable/socket.h ../include/portable/time.h \
../include/inn/qio.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h ../include/storage.h ../include/inn/vector.h \
+ ../include/inn/paths.h ../include/storage.h ../include/inn/vector.h \
../include/inn/timer.h
post.o: post.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h nnrpd.h \
../include/portable/socket.h ../include/portable/time.h \
../include/inn/qio.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h ../include/storage.h ../include/inn/vector.h \
+ ../include/inn/paths.h ../include/storage.h ../include/inn/vector.h \
../include/inn/timer.h ../include/ov.h ../include/inn/history.h \
post.h
python.o: python.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h nnrpd.h \
../include/portable/socket.h ../include/portable/time.h \
../include/inn/qio.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h ../include/storage.h ../include/inn/vector.h \
+ ../include/inn/paths.h ../include/storage.h ../include/inn/vector.h \
../include/inn/timer.h ../include/inn/hashtab.h
sasl_config.o: sasl_config.c ../include/config.h \
../include/inn/defines.h ../include/clibrary.h \
../include/inn/innconf.h nnrpd.h ../include/portable/socket.h \
../include/portable/time.h ../include/inn/qio.h ../include/libinn.h \
- ../include/nntp.h ../include/paths.h ../include/storage.h \
+ ../include/nntp.h ../include/inn/paths.h ../include/storage.h \
../include/inn/vector.h ../include/inn/timer.h sasl_config.h
tls.o: tls.c ../include/config.h ../include/inn/defines.h nnrpd.h \
../include/portable/socket.h ../include/portable/time.h \
../include/inn/qio.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h ../include/storage.h ../include/inn/vector.h \
+ ../include/inn/paths.h ../include/storage.h ../include/inn/vector.h \
../include/inn/timer.h tls.h
track.o: track.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h nnrpd.h \
../include/portable/socket.h ../include/portable/time.h \
../include/inn/qio.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h ../include/storage.h ../include/inn/vector.h \
+ ../include/inn/paths.h ../include/storage.h ../include/inn/vector.h \
../include/inn/timer.h
diff -u -r inn-STABLE-20061118/nnrpd/nnrpd.h inn-STABLE/nnrpd/nnrpd.h
--- inn-STABLE-20061118/nnrpd/nnrpd.h 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/nnrpd/nnrpd.h 2006-11-19 15:35:36.000000000 +0800
@@ -16,7 +16,7 @@
#include "inn/qio.h"
#include "libinn.h"
#include "nntp.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "storage.h"
#include "inn/vector.h"
#include "inn/timer.h"
diff -u -r inn-STABLE-20061118/nnrpd/perl.c inn-STABLE/nnrpd/perl.c
--- inn-STABLE-20061118/nnrpd/perl.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/nnrpd/perl.c 2006-11-19 15:35:36.000000000 +0800
@@ -18,7 +18,7 @@
#include "inn/innconf.h"
#include "nnrpd.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "post.h"
#include "nntp.h"
diff -u -r inn-STABLE-20061118/nnrpd/sasl_config.c inn-STABLE/nnrpd/sasl_config.c
--- inn-STABLE-20061118/nnrpd/sasl_config.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/nnrpd/sasl_config.c 2006-11-19 15:35:36.000000000 +0800
@@ -12,7 +12,7 @@
#include "inn/innconf.h"
#include "nnrpd.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "sasl_config.h"
#ifdef HAVE_SSL
diff -u -r inn-STABLE-20061118/samples/startup.tcl inn-STABLE/samples/startup.tcl
--- inn-STABLE-20061118/samples/startup.tcl 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/samples/startup.tcl 2006-11-19 15:35:36.000000000 +0800
@@ -3,7 +3,7 @@
## Tcl filter initialization code
##
## If you compile with Tcl support enabled, this file (even if empty) must
-## exist as pathfilter/_PATH_TCL_STARTUP (as defined in paths.h). This
+## exist as pathfilter/_PATH_TCL_STARTUP (as defined in inn/paths.h). This
## sample file defines the two functions that are called before and after
## reloading the filter code, but defines them as empty procs that do
## nothing.
diff -u -r inn-STABLE-20061118/storage/Makefile inn-STABLE/storage/Makefile
--- inn-STABLE-20061118/storage/Makefile 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/storage/Makefile 2006-11-19 15:35:36.000000000 +0800
@@ -99,11 +99,11 @@
expire.o: expire.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/inn/innconf.h ../include/libinn.h \
../include/ov.h ../include/storage.h ../include/inn/history.h \
- ovinterface.h ../include/paths.h
+ ovinterface.h ../include/inn/paths.h
interface.o: interface.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/conffile.h ../include/inn/innconf.h \
../include/inn/wire.h interface.h ../include/storage.h \
- ../include/libinn.h methods.h ../include/paths.h
+ ../include/libinn.h methods.h ../include/inn/paths.h
methods.o: methods.c interface.h ../include/config.h \
../include/inn/defines.h ../include/storage.h methods.h cnfs/cnfs.h \
timecaf/timecaf.h timehash/timehash.h tradspool/tradspool.h \
@@ -117,7 +117,7 @@
../include/inn/innconf.h ../include/inn/messages.h \
../include/inn/qio.h ../include/inn/wire.h ../include/inn/vector.h \
../include/libinn.h ovinterface.h ../include/ov.h \
- ../include/storage.h ../include/inn/history.h ../include/paths.h
+ ../include/storage.h ../include/inn/history.h ../include/inn/paths.h
ovmethods.o: ovmethods.c ovinterface.h ../include/config.h \
../include/inn/defines.h ../include/ov.h ../include/storage.h \
../include/inn/history.h buffindexed/buffindexed.h ovdb/ovdb.h \
@@ -126,19 +126,19 @@
../include/inn/defines.h ../include/clibrary.h \
../include/portable/mmap.h ../include/inn/innconf.h \
../include/libinn.h ../include/ov.h ../include/storage.h \
- ../include/inn/history.h ../include/paths.h ovinterface.h \
+ ../include/inn/history.h ../include/inn/paths.h ovinterface.h \
buffindexed/buffindexed.h
cnfs/cnfs.o: cnfs/cnfs.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/portable/mmap.h \
../include/portable/time.h ../include/inn/innconf.h interface.h \
- ../include/storage.h ../include/libinn.h methods.h ../include/paths.h \
+ ../include/storage.h ../include/libinn.h methods.h ../include/inn/paths.h \
../include/inn/wire.h ../include/inn/mmap.h cnfs/cnfs.h \
cnfs/cnfs-private.h
ovdb/ovdb.o: ovdb/ovdb.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/portable/socket.h \
../include/portable/time.h ../include/conffile.h \
../include/inn/innconf.h ../include/inn/messages.h \
- ../include/libinn.h ../include/paths.h ../include/storage.h \
+ ../include/libinn.h ../include/inn/paths.h ../include/storage.h \
../include/ov.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 \
@@ -147,12 +147,12 @@
../include/inn/defines.h ../include/clibrary.h \
../include/portable/mmap.h timecaf/caf.h ../include/inn/innconf.h \
../include/inn/wire.h ../include/libinn.h methods.h interface.h \
- ../include/storage.h timecaf/timecaf.h ../include/paths.h
+ ../include/storage.h timecaf/timecaf.h ../include/inn/paths.h
timehash/timehash.o: timehash/timehash.c ../include/config.h \
../include/inn/defines.h ../include/clibrary.h \
../include/portable/mmap.h ../include/inn/innconf.h \
../include/inn/wire.h ../include/libinn.h methods.h interface.h \
- ../include/storage.h ../include/paths.h timehash/timehash.h
+ ../include/storage.h ../include/inn/paths.h timehash/timehash.h
tradindexed/tdx-cache.o: tradindexed/tdx-cache.c ../include/config.h \
../include/inn/defines.h ../include/clibrary.h \
../include/inn/hashtab.h ../include/inn/messages.h \
@@ -169,7 +169,7 @@
../include/portable/mmap.h ../include/inn/hashtab.h \
../include/inn/innconf.h ../include/inn/messages.h \
../include/inn/mmap.h ../include/inn/qio.h ../include/libinn.h \
- ../include/paths.h tradindexed/tdx-private.h ../include/storage.h \
+ ../include/inn/paths.h tradindexed/tdx-private.h ../include/storage.h \
tradindexed/tdx-structure.h
tradindexed/tradindexed.o: tradindexed/tradindexed.c ../include/config.h \
../include/inn/defines.h ../include/clibrary.h \
@@ -181,7 +181,7 @@
../include/inn/defines.h ../include/clibrary.h \
../include/portable/mmap.h ../include/inn/innconf.h \
../include/inn/qio.h ../include/inn/wire.h ../include/libinn.h \
- ../include/paths.h methods.h interface.h ../include/storage.h \
+ ../include/inn/paths.h methods.h interface.h ../include/storage.h \
tradspool/tradspool.h
trash/trash.o: trash/trash.c ../include/config.h ../include/inn/defines.h \
../include/clibrary.h ../include/libinn.h methods.h interface.h \
@@ -191,5 +191,5 @@
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/innconf.h ../include/inn/messages.h \
../include/inn/vector.h ../include/libinn.h ../include/ov.h \
- ../include/storage.h ovinterface.h ../include/paths.h \
+ ../include/storage.h ovinterface.h ../include/inn/paths.h \
tradindexed/tdx-private.h tradindexed/tdx-structure.h
diff -u -r inn-STABLE-20061118/storage/buffindexed/buffindexed.c inn-STABLE/storage/buffindexed/buffindexed.c
--- inn-STABLE-20061118/storage/buffindexed/buffindexed.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/storage/buffindexed/buffindexed.c 2006-11-19 15:35:36.000000000 +0800
@@ -20,7 +20,7 @@
#include "inn/innconf.h"
#include "libinn.h"
#include "ov.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "ovinterface.h"
#include "storage.h"
diff -u -r inn-STABLE-20061118/storage/cnfs/cnfs.c inn-STABLE/storage/cnfs/cnfs.c
--- inn-STABLE-20061118/storage/cnfs/cnfs.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/storage/cnfs/cnfs.c 2006-11-19 15:35:36.000000000 +0800
@@ -22,7 +22,7 @@
#include "interface.h"
#include "libinn.h"
#include "methods.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "inn/wire.h"
#include "inn/mmap.h"
diff -u -r inn-STABLE-20061118/storage/expire.c inn-STABLE/storage/expire.c
--- inn-STABLE-20061118/storage/expire.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/storage/expire.c 2006-11-19 15:35:36.000000000 +0800
@@ -17,7 +17,7 @@
#include "libinn.h"
#include "ov.h"
#include "ovinterface.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "storage.h"
enum KRP {Keep, Remove, Poison};
diff -u -r inn-STABLE-20061118/storage/interface.c inn-STABLE/storage/interface.c
--- inn-STABLE-20061118/storage/interface.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/storage/interface.c 2006-11-19 15:35:36.000000000 +0800
@@ -15,7 +15,7 @@
#include "interface.h"
#include "libinn.h"
#include "methods.h"
-#include "paths.h"
+#include "inn/paths.h"
typedef enum {INIT_NO, INIT_DONE, INIT_FAIL} INITTYPE;
typedef struct {
diff -u -r inn-STABLE-20061118/storage/ovdb/ovdb.c inn-STABLE/storage/ovdb/ovdb.c
--- inn-STABLE-20061118/storage/ovdb/ovdb.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/storage/ovdb/ovdb.c 2006-11-19 15:35:36.000000000 +0800
@@ -90,7 +90,7 @@
#include "inn/innconf.h"
#include "inn/messages.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "storage.h"
#include "ov.h"
diff -u -r inn-STABLE-20061118/storage/overdata.c inn-STABLE/storage/overdata.c
--- inn-STABLE-20061118/storage/overdata.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/storage/overdata.c 2006-11-19 15:35:36.000000000 +0800
@@ -18,7 +18,7 @@
#include "inn/vector.h"
#include "libinn.h"
#include "ovinterface.h"
-#include "paths.h"
+#include "inn/paths.h"
/* The standard overview fields. */
diff -u -r inn-STABLE-20061118/storage/timecaf/timecaf.c inn-STABLE/storage/timecaf/timecaf.c
--- inn-STABLE-20061118/storage/timecaf/timecaf.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/storage/timecaf/timecaf.c 2006-11-19 15:35:36.000000000 +0800
@@ -21,7 +21,7 @@
#include "libinn.h"
#include "methods.h"
#include "timecaf.h"
-#include "paths.h"
+#include "inn/paths.h"
/* Needed for htonl() and friends on AIX 4.1. */
#include <netinet/in.h>
diff -u -r inn-STABLE-20061118/storage/timehash/timehash.c inn-STABLE/storage/timehash/timehash.c
--- inn-STABLE-20061118/storage/timehash/timehash.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/storage/timehash/timehash.c 2006-11-19 15:35:36.000000000 +0800
@@ -19,7 +19,7 @@
#include "inn/wire.h"
#include "libinn.h"
#include "methods.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "timehash.h"
typedef struct {
diff -u -r inn-STABLE-20061118/storage/tradindexed/tdx-group.c inn-STABLE/storage/tradindexed/tdx-group.c
--- inn-STABLE-20061118/storage/tradindexed/tdx-group.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/storage/tradindexed/tdx-group.c 2006-11-19 15:35:36.000000000 +0800
@@ -97,7 +97,7 @@
#include "inn/qio.h"
#include "inn/vector.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "tdx-private.h"
#include "tdx-structure.h"
diff -u -r inn-STABLE-20061118/storage/tradindexed/tdx-util.c inn-STABLE/storage/tradindexed/tdx-util.c
--- inn-STABLE-20061118/storage/tradindexed/tdx-util.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/storage/tradindexed/tdx-util.c 2006-11-19 15:35:36.000000000 +0800
@@ -23,7 +23,7 @@
#include "libinn.h"
#include "ov.h"
#include "ovinterface.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "tdx-private.h"
#include "tdx-structure.h"
diff -u -r inn-STABLE-20061118/storage/tradspool/tradspool.c inn-STABLE/storage/tradspool/tradspool.c
--- inn-STABLE-20061118/storage/tradspool/tradspool.c 2006-11-18 18:07:18.000000000 +0800
+++ inn-STABLE/storage/tradspool/tradspool.c 2006-11-19 15:35:36.000000000 +0800
@@ -22,7 +22,7 @@
#include "inn/qio.h"
#include "inn/wire.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "methods.h"
#include "tradspool.h"
More information about the inn-workers
mailing list