Patch: include/paths.h --> include/inn/paths.h in inn-CURRENT
Adam J. Richter
adam at yggdrasil.com
Sun Nov 19 09:32:58 UTC 2006
http://marc.10east.com/?l=inn-workers&m=105639025312796&w=2
Given that this trivial problem has been around for years and
breaks the build of so many other program, I suggest that the following
patch or some refinement thereof be integrated promptly rather than
waiting for who knows how many more years for inn-2.5.
This patch to inn-CURRENT moves include/paths.h to
include/inn/paths.h to avoid conflicts with glibc. The changes were
made by manually editing the TODO file, and then running the following
shell commands from the top of the inn source tree:
mv include/paths.h.in include/inn/
for file in $(find . -type f | xargs grep -l paths.h) ; do
ed $file << DONE
1,\$s|paths.h|inn/paths.h|g
w
q
DONE
done
Because I do not run a news server at the moment, I have only
verified that inn with a default configuration on still compiles with
the patch applied, and with the glibc version of /usr/include/paths.h
installed, on x86 + linux-2.6.18 + glibc-2.5. On the other hand, it's
an include file whose contents are not modified by the patch, so I
imagine you should be able to look it over, and check it in with few
modifications to the development branch at least.
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.
Adam Richter
diff -u -r inn-CURRENT-20061118/HACKING inn-CURRENT/HACKING
--- inn-CURRENT-20061118/HACKING 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/HACKING 2006-11-19 16:19:42.000000000 +0800
@@ -371,7 +371,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 innconf_read() and use the global innconf
diff -u -r inn-CURRENT-20061118/MANIFEST inn-CURRENT/MANIFEST
--- inn-CURRENT-20061118/MANIFEST 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/MANIFEST 2006-11-19 16:19:42.000000000 +0800
@@ -398,7 +398,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/alloca.h alloca replacement header
include/portable/getaddrinfo.h getaddrinfo replacement header
diff -u -r inn-CURRENT-20061118/Makefile.global.in inn-CURRENT/Makefile.global.in
--- inn-CURRENT-20061118/Makefile.global.in 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/Makefile.global.in 2006-11-19 16:19:42.000000000 +0800
@@ -175,7 +175,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 = @AWK@
COMPRESS = @COMPRESS@
diff -u -r inn-CURRENT-20061118/TODO inn-CURRENT/TODO
--- inn-CURRENT-20061118/TODO 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/TODO 2006-11-19 16:34:12.000000000 +0800
@@ -229,11 +229,10 @@
options instead if at all possible, maybe in specific sub-sections 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).
* Update all INN code to use include/inn/nntp.h for NNTP codes and
eliminate include/nntp.h.
diff -u -r inn-CURRENT-20061118/authprogs/Makefile inn-CURRENT/authprogs/Makefile
--- inn-CURRENT-20061118/authprogs/Makefile 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/authprogs/Makefile 2006-11-19 16:19:42.000000000 +0800
@@ -117,5 +117,5 @@
../include/inn/system.h ../include/inn/options.h ../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/nntp.h ../include/inn/paths.h ../include/conffile.h libauth.h \
../include/portable/socket.h ../include/portable/getaddrinfo.h
diff -u -r inn-CURRENT-20061118/authprogs/radius.c inn-CURRENT/authprogs/radius.c
--- inn-CURRENT-20061118/authprogs/radius.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/authprogs/radius.c 2006-11-19 16:19:42.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-CURRENT-20061118/backends/Makefile inn-CURRENT/backends/Makefile
--- inn-CURRENT-20061118/backends/Makefile 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/backends/Makefile 2006-11-19 16:19:42.000000000 +0800
@@ -131,32 +131,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 \
@@ -166,22 +166,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-CURRENT-20061118/backends/actsync.c inn-CURRENT/backends/actsync.c
--- inn-CURRENT-20061118/backends/actsync.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/backends/actsync.c 2006-11-19 16:19:42.000000000 +0800
@@ -73,7 +73,7 @@
#include "inn/hashtab.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-CURRENT-20061118/backends/archive.c inn-CURRENT/backends/archive.c
--- inn-CURRENT-20061118/backends/archive.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/backends/archive.c 2006-11-19 16:19:42.000000000 +0800
@@ -16,7 +16,7 @@
#include "inn/vector.h"
#include "inn/wire.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "storage.h"
diff -u -r inn-CURRENT-20061118/backends/batcher.c inn-CURRENT/backends/batcher.c
--- inn-CURRENT-20061118/backends/batcher.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/backends/batcher.c 2006-11-19 16:19:42.000000000 +0800
@@ -17,7 +17,7 @@
#include "inn/timer.h"
#include "inn/wire.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "storage.h"
diff -u -r inn-CURRENT-20061118/backends/buffchan.c inn-CURRENT/backends/buffchan.c
--- inn-CURRENT-20061118/backends/buffchan.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/backends/buffchan.c 2006-11-19 16:19:42.000000000 +0800
@@ -15,7 +15,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-CURRENT-20061118/backends/crosspost.c inn-CURRENT/backends/crosspost.c
--- inn-CURRENT-20061118/backends/crosspost.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/backends/crosspost.c 2006-11-19 16:19:42.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-CURRENT-20061118/backends/cvtbatch.c inn-CURRENT/backends/cvtbatch.c
--- inn-CURRENT-20061118/backends/cvtbatch.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/backends/cvtbatch.c 2006-11-19 16:19:42.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-CURRENT-20061118/backends/filechan.c inn-CURRENT/backends/filechan.c
--- inn-CURRENT-20061118/backends/filechan.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/backends/filechan.c 2006-11-19 16:19:42.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-CURRENT-20061118/backends/inndf.c inn-CURRENT/backends/inndf.c
--- inn-CURRENT-20061118/backends/inndf.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/backends/inndf.c 2006-11-19 16:19:42.000000000 +0800
@@ -51,7 +51,7 @@
#include "inn/overview.h"
#include "inn/qio.h"
#include "libinn.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-CURRENT-20061118/backends/innxmit.c inn-CURRENT/backends/innxmit.c
--- inn-CURRENT-20061118/backends/innxmit.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/backends/innxmit.c 2006-11-19 16:19:42.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-CURRENT-20061118/backends/map.c inn-CURRENT/backends/map.c
--- inn-CURRENT-20061118/backends/map.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/backends/map.c 2006-11-19 16:19:42.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-CURRENT-20061118/backends/nntpget.c inn-CURRENT/backends/nntpget.c
--- inn-CURRENT-20061118/backends/nntpget.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/backends/nntpget.c 2006-11-19 16:19:42.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-CURRENT-20061118/backends/overchan.c inn-CURRENT/backends/overchan.c
--- inn-CURRENT-20061118/backends/overchan.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/backends/overchan.c 2006-11-19 16:19:42.000000000 +0800
@@ -22,7 +22,7 @@
#include "inn/overview.h"
#include "inn/qio.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
/* Statistics kept while overchan is running. */
struct statistics {
diff -u -r inn-CURRENT-20061118/configure inn-CURRENT/configure
--- inn-CURRENT-20061118/configure 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/configure 2006-11-19 16:19:42.000000000 +0800
@@ -34031,7 +34031,7 @@
LIBS=`echo "$LIBS" | sed 's/^ *//' | sed 's/ */ /g' | sed 's/ *$//'`
-ac_config_files="$ac_config_files Makefile.global include/paths.h"
+ac_config_files="$ac_config_files Makefile.global include/inn/paths.h"
ac_config_files="$ac_config_files scripts/inncheck scripts/innshellvars"
@@ -34590,7 +34590,7 @@
do
case $ac_config_target in
"Makefile.global") CONFIG_FILES="$CONFIG_FILES Makefile.global" ;;
- "include/paths.h") CONFIG_FILES="$CONFIG_FILES include/paths.h" ;;
+ "include/inn/paths.h") CONFIG_FILES="$CONFIG_FILES include/inn/paths.h" ;;
"scripts/inncheck") CONFIG_FILES="$CONFIG_FILES scripts/inncheck" ;;
"scripts/innshellvars") CONFIG_FILES="$CONFIG_FILES scripts/innshellvars" ;;
"scripts/innshellvars.pl") CONFIG_FILES="$CONFIG_FILES scripts/innshellvars.pl" ;;
@@ -35289,7 +35289,7 @@
Makefile.global
include/config.h
include/inn/options.h
- include/paths.h
+ include/inn/paths.h
innfeed/innfeed.h
EOM
diff -u -r inn-CURRENT-20061118/configure.ac inn-CURRENT/configure.ac
--- inn-CURRENT-20061118/configure.ac 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/configure.ac 2006-11-19 16:19:42.000000000 +0800
@@ -509,7 +509,7 @@
dnl Configure our output files. Try to keep this as limited as possible,
dnl since it directly affects how long it takes configure to complete.
-AC_CONFIG_FILES([Makefile.global include/paths.h])
+AC_CONFIG_FILES([Makefile.global include/inn/paths.h])
AC_CONFIG_FILES([scripts/inncheck scripts/innshellvars])
AC_CONFIG_FILES([scripts/innshellvars.pl scripts/innshellvars.tcl])
AC_CONFIG_FILES([scripts/news.daily])
@@ -536,7 +536,7 @@
Makefile.global
include/config.h
include/inn/options.h
- include/paths.h
+ include/inn/paths.h
innfeed/innfeed.h
EOM
diff -u -r inn-CURRENT-20061118/contrib/respool.c inn-CURRENT/contrib/respool.c
--- inn-CURRENT-20061118/contrib/respool.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/contrib/respool.c 2006-11-19 16:19:42.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-CURRENT-20061118/doc/hook-perl inn-CURRENT/doc/hook-perl
--- inn-CURRENT-20061118/doc/hook-perl 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/doc/hook-perl 2006-11-19 16:19:42.000000000 +0800
@@ -31,8 +31,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-CURRENT-20061118/doc/pod/hacking.pod inn-CURRENT/doc/pod/hacking.pod
--- inn-CURRENT-20061118/doc/pod/hacking.pod 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/doc/pod/hacking.pod 2006-11-19 16:19:42.000000000 +0800
@@ -364,7 +364,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 innconf_read() and use the global innconf
diff -u -r inn-CURRENT-20061118/doc/pod/hook-perl.pod inn-CURRENT/doc/pod/hook-perl.pod
--- inn-CURRENT-20061118/doc/pod/hook-perl.pod 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/doc/pod/hook-perl.pod 2006-11-19 16:19:42.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
@@ -276,7 +276,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-CURRENT-20061118/expire/Makefile inn-CURRENT/expire/Makefile
--- inn-CURRENT-20061118/expire/Makefile 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/expire/Makefile 2006-11-19 16:19:42.000000000 +0800
@@ -93,13 +93,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 \
@@ -107,19 +107,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-CURRENT-20061118/expire/expire.c inn-CURRENT/expire/expire.c
--- inn-CURRENT-20061118/expire/expire.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/expire/expire.c 2006-11-19 16:19:42.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-CURRENT-20061118/expire/expireover.c inn-CURRENT/expire/expireover.c
--- inn-CURRENT-20061118/expire/expireover.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/expire/expireover.c 2006-11-19 16:19:42.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-CURRENT-20061118/expire/grephistory.c inn-CURRENT/expire/grephistory.c
--- inn-CURRENT-20061118/expire/grephistory.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/expire/grephistory.c 2006-11-19 16:19:42.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-CURRENT-20061118/expire/makedbz.c inn-CURRENT/expire/makedbz.c
--- inn-CURRENT-20061118/expire/makedbz.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/expire/makedbz.c 2006-11-19 16:19:42.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-CURRENT-20061118/expire/makehistory.c inn-CURRENT/expire/makehistory.c
--- inn-CURRENT-20061118/expire/makehistory.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/expire/makehistory.c 2006-11-19 16:19:42.000000000 +0800
@@ -20,7 +20,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-CURRENT-20061118/expire/prunehistory.c inn-CURRENT/expire/prunehistory.c
--- inn-CURRENT-20061118/expire/prunehistory.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/expire/prunehistory.c 2006-11-19 16:19:42.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-CURRENT-20061118/frontends/Makefile inn-CURRENT/frontends/Makefile
--- inn-CURRENT-20061118/frontends/Makefile 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/frontends/Makefile 2006-11-19 16:19:42.000000000 +0800
@@ -126,7 +126,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 \
@@ -134,11 +134,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 \
@@ -160,19 +160,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-CURRENT-20061118/frontends/ctlinnd.c inn-CURRENT/frontends/ctlinnd.c
--- inn-CURRENT-20061118/frontends/ctlinnd.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/frontends/ctlinnd.c 2006-11-19 16:19:42.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-CURRENT-20061118/frontends/getlist.c inn-CURRENT/frontends/getlist.c
--- inn-CURRENT-20061118/frontends/getlist.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/frontends/getlist.c 2006-11-19 16:19:42.000000000 +0800
@@ -13,7 +13,7 @@
#include "inn/qio.h"
#include "inn/vector.h"
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
static const char usage[] = "\
Usage: getlist [-A] [-h host] [-p port] [list [pattern [types]]]\n\
diff -u -r inn-CURRENT-20061118/frontends/inews.c inn-CURRENT/frontends/inews.c
--- inn-CURRENT-20061118/frontends/inews.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/frontends/inews.c 2006-11-19 16:19:42.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-CURRENT-20061118/frontends/ovdb_server.c inn-CURRENT/frontends/ovdb_server.c
--- inn-CURRENT-20061118/frontends/ovdb_server.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/frontends/ovdb_server.c 2006-11-19 16:19:42.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-CURRENT-20061118/frontends/ovdb_stat.c inn-CURRENT/frontends/ovdb_stat.c
--- inn-CURRENT-20061118/frontends/ovdb_stat.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/frontends/ovdb_stat.c 2006-11-19 16:19:42.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-CURRENT-20061118/frontends/rnews.c inn-CURRENT/frontends/rnews.c
--- inn-CURRENT-20061118/frontends/rnews.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/frontends/rnews.c 2006-11-19 16:19:42.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-CURRENT-20061118/include/Makefile inn-CURRENT/include/Makefile
--- inn-CURRENT-20061118/include/Makefile 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/include/Makefile 2006-11-19 16:19:42.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-CURRENT/include/inn: paths.h.in
Only in inn-CURRENT-20061118/include: paths.h.in
diff -u -r inn-CURRENT-20061118/innd/Makefile inn-CURRENT/innd/Makefile
--- inn-CURRENT-20061118/innd/Makefile 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/innd/Makefile 2006-11-19 16:19:42.000000000 +0800
@@ -77,113 +77,113 @@
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
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
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-CURRENT-20061118/innd/innd.h inn-CURRENT/innd/innd.h
--- inn-CURRENT-20061118/innd/innd.h 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/innd/innd.h 2006-11-19 16:19:42.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"
BEGIN_DECLS
diff -u -r inn-CURRENT-20061118/lib/Makefile inn-CURRENT/lib/Makefile
--- inn-CURRENT-20061118/lib/Makefile 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/lib/Makefile 2006-11-19 16:19:42.000000000 +0800
@@ -96,7 +96,7 @@
clientactive.o: clientactive.c ../include/config.h \
../include/inn/defines.h ../include/inn/system.h \
../include/inn/options.h ../include/clibrary.h ../include/inn/innconf.h \
- ../include/libinn.h ../include/nntp.h ../include/paths.h
+ ../include/libinn.h ../include/nntp.h ../include/inn/paths.h
clientlib.o: clientlib.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/inn/innconf.h ../include/libinn.h ../include/nntp.h
@@ -122,7 +122,7 @@
../include/inn/mmap.h
defdist.o: defdist.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/inn/innconf.h ../include/libinn.h ../include/paths.h
+ ../include/inn/innconf.h ../include/libinn.h ../include/inn/paths.h
dispatch.o: dispatch.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/inn/dispatch.h ../include/inn/vector.h
@@ -137,11 +137,11 @@
../include/inn/innconf.h ../include/libinn.h
getfqdn.o: getfqdn.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/libinn.h ../include/paths.h
+ ../include/libinn.h ../include/inn/paths.h
getmodaddr.o: getmodaddr.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/inn/innconf.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h
+ ../include/inn/paths.h
hash.o: hash.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/inn/md5.h ../include/inn/utility.h ../include/libinn.h
@@ -155,20 +155,20 @@
../include/inn/system.h ../include/inn/options.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/paths.h
inndcomm.o: inndcomm.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/portable/time.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/inn/innconf.h ../include/inndcomm.h ../include/libinn.h \
- ../include/paths.h
+ ../include/inn/paths.h
list.o: list.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/inn/list.h
localopen.o: localopen.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/inn/innconf.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h
+ ../include/inn/paths.h
lockfile.o: lockfile.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/libinn.h
@@ -224,7 +224,7 @@
sendpass.o: sendpass.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/inn/innconf.h ../include/libinn.h ../include/nntp.h \
- ../include/paths.h
+ ../include/inn/paths.h
sequence.o: sequence.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/inn/sequence.h
diff -u -r inn-CURRENT-20061118/lib/clientactive.c inn-CURRENT/lib/clientactive.c
--- inn-CURRENT-20061118/lib/clientactive.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/lib/clientactive.c 2006-11-19 16:19:42.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-CURRENT-20061118/lib/defdist.c inn-CURRENT/lib/defdist.c
--- inn-CURRENT-20061118/lib/defdist.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/lib/defdist.c 2006-11-19 16:19:42.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-CURRENT-20061118/lib/getfqdn.c inn-CURRENT/lib/getfqdn.c
--- inn-CURRENT-20061118/lib/getfqdn.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/lib/getfqdn.c 2006-11-19 16:19:42.000000000 +0800
@@ -7,7 +7,7 @@
#include <netdb.h>
#include "libinn.h"
-#include "paths.h"
+#include "inn/paths.h"
/*
diff -u -r inn-CURRENT-20061118/lib/getmodaddr.c inn-CURRENT/lib/getmodaddr.c
--- inn-CURRENT-20061118/lib/getmodaddr.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/lib/getmodaddr.c 2006-11-19 16:19:42.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-CURRENT-20061118/lib/innconf.c inn-CURRENT/lib/innconf.c
--- inn-CURRENT-20061118/lib/innconf.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/lib/innconf.c 2006-11-19 16:19:42.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-CURRENT-20061118/lib/inndcomm.c inn-CURRENT/lib/inndcomm.c
--- inn-CURRENT-20061118/lib/inndcomm.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/lib/inndcomm.c 2006-11-19 16:19:42.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-CURRENT-20061118/lib/localopen.c inn-CURRENT/lib/localopen.c
--- inn-CURRENT-20061118/lib/localopen.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/lib/localopen.c 2006-11-19 16:19:42.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-CURRENT-20061118/lib/sendpass.c inn-CURRENT/lib/sendpass.c
--- inn-CURRENT-20061118/lib/sendpass.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/lib/sendpass.c 2006-11-19 16:19:42.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-CURRENT-20061118/m4/paths.m4 inn-CURRENT/m4/paths.m4
--- inn-CURRENT-20061118/m4/paths.m4 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/m4/paths.m4 2006-11-19 16:19:42.000000000 +0800
@@ -42,7 +42,7 @@
[AC_HELP_STRING([--with-tmp-dir=PATH],
[Path for temporary files [PREFIX/tmp]])])
-dnl Some additional paths used by paths.h.
+dnl Some additional paths used by inn/paths.h.
eval PATH_CONFIG="$sysconfdir"
eval PATH_TMP="$tmpdir"
AC_SUBST([PATH_CONFIG])
diff -u -r inn-CURRENT-20061118/nnrpd/Makefile inn-CURRENT/nnrpd/Makefile
--- inn-CURRENT-20061118/nnrpd/Makefile 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/nnrpd/Makefile 2006-11-19 16:19:42.000000000 +0800
@@ -81,7 +81,7 @@
../include/inn/wire.h nnrpd.h ../include/portable/socket.h \
../include/portable/getaddrinfo.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
auth-ext.o: auth-ext.c ../include/config.h ../include/inn/defines.h \
@@ -90,7 +90,7 @@
../include/inn/messages.h ../include/inn/vector.h nnrpd.h \
../include/portable/socket.h ../include/portable/getaddrinfo.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/timer.h
cache.o: cache.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
@@ -101,14 +101,14 @@
../include/inn/innconf.h nnrpd.h ../include/portable/socket.h \
../include/portable/getaddrinfo.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/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/portable/wait.h nnrpd.h ../include/portable/socket.h \
../include/portable/getaddrinfo.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 \
../include/inn/version.h tls.h
@@ -117,13 +117,13 @@
../include/inn/messages.h nnrpd.h ../include/portable/socket.h \
../include/portable/getaddrinfo.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
list.o: list.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
nnrpd.h ../include/portable/socket.h ../include/portable/getaddrinfo.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
@@ -132,7 +132,7 @@
../include/inn/innconf.h nnrpd.h ../include/portable/socket.h \
../include/portable/getaddrinfo.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
newnews.o: newnews.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
@@ -140,7 +140,7 @@
../include/inn/wire.h nnrpd.h ../include/portable/socket.h \
../include/portable/getaddrinfo.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 \
../include/inn/system.h ../include/inn/options.h \
@@ -157,7 +157,7 @@
../include/inn/innconf.h nnrpd.h ../include/portable/socket.h \
../include/portable/getaddrinfo.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 \
@@ -166,21 +166,21 @@
../include/inn/innconf.h ../include/innperl.h nnrpd.h \
../include/portable/socket.h ../include/portable/getaddrinfo.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
post.o: post.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/inn/innconf.h nnrpd.h ../include/portable/socket.h \
../include/portable/getaddrinfo.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/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/inn/innconf.h nnrpd.h ../include/portable/socket.h \
../include/portable/getaddrinfo.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.o: sasl.c ../include/config.h ../include/inn/defines.h \
@@ -188,14 +188,14 @@
../include/inn/messages.h nnrpd.h ../include/portable/socket.h \
../include/portable/getaddrinfo.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.o: tls.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h \
../include/portable/alloca.h ../include/clibrary.h nnrpd.h \
../include/portable/socket.h ../include/portable/getaddrinfo.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/inn/innconf.h \
tls.h
track.o: track.c ../include/config.h ../include/inn/defines.h \
@@ -203,5 +203,5 @@
../include/inn/innconf.h nnrpd.h ../include/portable/socket.h \
../include/portable/getaddrinfo.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-CURRENT-20061118/nnrpd/nnrpd.h inn-CURRENT/nnrpd/nnrpd.h
--- inn-CURRENT-20061118/nnrpd/nnrpd.h 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/nnrpd/nnrpd.h 2006-11-19 16:19:42.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-CURRENT-20061118/nnrpd/perl.c inn-CURRENT/nnrpd/perl.c
--- inn-CURRENT-20061118/nnrpd/perl.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/nnrpd/perl.c 2006-11-19 16:19:42.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-CURRENT-20061118/storage/Makefile inn-CURRENT/storage/Makefile
--- inn-CURRENT-20061118/storage/Makefile 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/storage/Makefile 2006-11-19 16:19:42.000000000 +0800
@@ -102,11 +102,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 \
@@ -120,7 +120,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 \
@@ -129,19 +129,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 \
@@ -150,12 +150,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 \
@@ -172,7 +172,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 \
@@ -184,7 +184,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 \
@@ -194,5 +194,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-CURRENT-20061118/storage/buffindexed/buffindexed.c inn-CURRENT/storage/buffindexed/buffindexed.c
--- inn-CURRENT-20061118/storage/buffindexed/buffindexed.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/storage/buffindexed/buffindexed.c 2006-11-19 16:19:42.000000000 +0800
@@ -33,7 +33,7 @@
#include "inn/messages.h"
#include "libinn.h"
#include "ov.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "ovinterface.h"
#include "storage.h"
diff -u -r inn-CURRENT-20061118/storage/cnfs/cnfs.c inn-CURRENT/storage/cnfs/cnfs.c
--- inn-CURRENT-20061118/storage/cnfs/cnfs.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/storage/cnfs/cnfs.c 2006-11-19 16:19:42.000000000 +0800
@@ -24,7 +24,7 @@
#include "interface.h"
#include "libinn.h"
#include "methods.h"
-#include "paths.h"
+#include "inn/paths.h"
#include "cnfs.h"
#include "cnfs-private.h"
diff -u -r inn-CURRENT-20061118/storage/expire.c inn-CURRENT/storage/expire.c
--- inn-CURRENT-20061118/storage/expire.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/storage/expire.c 2006-11-19 16:19:42.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-CURRENT-20061118/storage/interface.c inn-CURRENT/storage/interface.c
--- inn-CURRENT-20061118/storage/interface.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/storage/interface.c 2006-11-19 16:19:42.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-CURRENT-20061118/storage/ovdb/ovdb.c inn-CURRENT/storage/ovdb/ovdb.c
--- inn-CURRENT-20061118/storage/ovdb/ovdb.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/storage/ovdb/ovdb.c 2006-11-19 16:19:42.000000000 +0800
@@ -94,7 +94,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-CURRENT-20061118/storage/overdata.c inn-CURRENT/storage/overdata.c
--- inn-CURRENT-20061118/storage/overdata.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/storage/overdata.c 2006-11-19 16:19:42.000000000 +0800
@@ -19,7 +19,7 @@
#include "libinn.h"
#include "ov.h"
#include "ovinterface.h"
-#include "paths.h"
+#include "inn/paths.h"
/* The standard overview fields. */
diff -u -r inn-CURRENT-20061118/storage/timecaf/timecaf.c inn-CURRENT/storage/timecaf/timecaf.c
--- inn-CURRENT-20061118/storage/timecaf/timecaf.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/storage/timecaf/timecaf.c 2006-11-19 16:19:42.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-CURRENT-20061118/storage/timehash/timehash.c inn-CURRENT/storage/timehash/timehash.c
--- inn-CURRENT-20061118/storage/timehash/timehash.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/storage/timehash/timehash.c 2006-11-19 16:19:42.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-CURRENT-20061118/storage/tradindexed/tdx-group.c inn-CURRENT/storage/tradindexed/tdx-group.c
--- inn-CURRENT-20061118/storage/tradindexed/tdx-group.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/storage/tradindexed/tdx-group.c 2006-11-19 16:19:42.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-CURRENT-20061118/storage/tradindexed/tdx-util.c inn-CURRENT/storage/tradindexed/tdx-util.c
--- inn-CURRENT-20061118/storage/tradindexed/tdx-util.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/storage/tradindexed/tdx-util.c 2006-11-19 16:19:42.000000000 +0800
@@ -24,7 +24,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-CURRENT-20061118/storage/tradspool/tradspool.c inn-CURRENT/storage/tradspool/tradspool.c
--- inn-CURRENT-20061118/storage/tradspool/tradspool.c 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/storage/tradspool/tradspool.c 2006-11-19 16:19:42.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"
diff -u -r inn-CURRENT-20061118/support/mkmanifest inn-CURRENT/support/mkmanifest
--- inn-CURRENT-20061118/support/mkmanifest 2006-11-18 18:04:17.000000000 +0800
+++ inn-CURRENT/support/mkmanifest 2006-11-19 16:19:42.000000000 +0800
@@ -167,7 +167,7 @@
frontends/sm
history/buildconfig
include/config.h
-include/paths.h
+include/inn/paths.h
include/inn/system.h
include/inn/version.h
innd/innd
More information about the inn-workers
mailing list