* started to address portability problems in the id-utils-4.0 release

9 files changed, 29 insertions, 19 deletions

diff --git a/libidu/Makefile.in b/libidu/Makefile.in
index 76ad8b6..30cb6fa 100644
--- a/libidu/Makefile.in
+++ b/libidu/Makefile.in
@@ -45,6 +45,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \
 	$(top_srcdir)/m4/atexit.m4 $(top_srcdir)/m4/closeout.m4 \
 	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/d-ino.m4 \
+	$(top_srcdir)/m4/dirname.m4 $(top_srcdir)/m4/dos.m4 \
 	$(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exclude.m4 \
 	$(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \
 	$(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \
diff --git a/libidu/dynvec.c b/libidu/dynvec.c
index b098214..2b75490 100644
--- a/libidu/dynvec.c
+++ b/libidu/dynvec.c
@@ -19,8 +19,8 @@
 
 #include <config.h>
 #include <stdlib.h>
+#include <xalloc.h>
 #include "dynvec.h"
-#include "xalloc.h"
 
 struct dynvec *
 make_dynvec (int n)
diff --git a/libidu/fnprint.c b/libidu/fnprint.c
index 1ba0159..45ad946 100644
--- a/libidu/fnprint.c
+++ b/libidu/fnprint.c
@@ -22,10 +22,11 @@
 #include <alloca.h>
 #include <unistd.h>
 #include <string.h>
-#include "pathmax.h"
+#include <pathmax.h>
+#include <error.h>
+
 #include "idfile.h"
 #include "xnls.h"
-#include "error.h"
 #include "iduglobal.h"
 
 char const *root_name (char const *path);
diff --git a/libidu/hash.c b/libidu/hash.c
index ce93fa7..7941ad5 100644
--- a/libidu/hash.c
+++ b/libidu/hash.c
@@ -20,10 +20,11 @@
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <xalloc.h>
+#include <error.h>
+
 #include "hash.h"
 #include "xnls.h"
-#include "xalloc.h"
-#include "error.h"
 
 static void hash_rehash (struct hash_table* ht);
 static unsigned long round_up_2 (unsigned long rough);
diff --git a/libidu/idfile.c b/libidu/idfile.c
index 04afb16..6d2d539 100644
--- a/libidu/idfile.c
+++ b/libidu/idfile.c
@@ -22,11 +22,13 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strsep.h>
 #include <sys/stat.h>
+#include <obstack.h>
+#include <error.h>
+
 #include "xnls.h"
-#include "obstack.h"
 #include "idfile.h"
-#include "error.h"
 
 int io_size (FILE *, void *, unsigned int size, int);
 
diff --git a/libidu/idread.c b/libidu/idread.c
index 4d4215f..81301d0 100644
--- a/libidu/idread.c
+++ b/libidu/idread.c
@@ -22,12 +22,12 @@
 #include <stddef.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <obstack.h>
+#include <xalloc.h>
+#include <error.h>
 
 #include "idfile.h"
 #include "hash.h"
-#include "error.h"
-#include "obstack.h"
-#include "xalloc.h"
 #include "xnls.h"
 #include "iduglobal.h"
 
diff --git a/libidu/idwrite.c b/libidu/idwrite.c
index 08aa480..ac88edf 100644
--- a/libidu/idwrite.c
+++ b/libidu/idwrite.c
@@ -19,12 +19,13 @@
 
 #include <config.h>
 #include <stdlib.h>
+#include <obstack.h>
+#include <xalloc.h>
+#include <error.h>
+
 #include "idfile.h"
 #include "hash.h"
-#include "obstack.h"
-#include "xalloc.h"
 #include "xnls.h"
-#include "error.h"
 
 int file_link_qsort_compare (void const *x, void const *y);
 
diff --git a/libidu/scanners.c b/libidu/scanners.c
index eaeb8b9..3ede033 100644
--- a/libidu/scanners.c
+++ b/libidu/scanners.c
@@ -26,10 +26,12 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <string.h>
+#include <strsep.h>
 #include <errno.h>
-#include "xalloc.h"
+#include <xalloc.h>
+#include <error.h>
+
 #include "xnls.h"
-#include "error.h"
 #include "scanners.h"
 #include "tokflags.h"
 #include "iduglobal.h"
diff --git a/libidu/walker.c b/libidu/walker.c
index 7b63e5d..c3e5369 100644
--- a/libidu/walker.c
+++ b/libidu/walker.c
@@ -24,17 +24,19 @@
 #include <stddef.h>
 #include <unistd.h>
 #include <string.h>
+#include <strsep.h>
 #include <fnmatch.h>
 #include <dirent.h>
 #include <errno.h>
+#include <alloca.h>
+#include <xalloc.h>
+#include <error.h>
+#include <pathmax.h>
+
 #include "xnls.h"
 #include "idfile.h"
-#include "error.h"
-#include "xalloc.h"
 #include "dynvec.h"
 #include "scanners.h"
-#include "pathmax.h"
-#include "xalloc.h"
 #include "iduglobal.h"
 
 int walker_verbose_flag = 0;