Properly qualify Netpbm include files - avoid conflict with DJGPP's <io.h>

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2367 9d0c8265-081b-0410-96cb-a4ca84ce46f8

29 files changed, 76 insertions, 60 deletions

diff --git a/lib/Makefile b/lib/Makefile
index b47c3aae..19557909 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -68,6 +68,7 @@ SCRIPTS =
 BINARIES = 
 
 OMIT_LIBRARY_RULE = 1
+ALL_INTERNAL_HEADER_FILES_ARE_QUALIFIED = Y
 include $(SRCDIR)/common.mk
 
 # The following must go after common.mk because $(LIBNETPBM) may 
diff --git a/lib/colorname.c b/lib/colorname.c
index c23eb13f..123de75e 100644
--- a/lib/colorname.c
+++ b/lib/colorname.c
@@ -15,13 +15,14 @@
 #define _BSD_SOURCE 1      /* Make sure strdup() is in string.h */
 #define _XOPEN_SOURCE 500  /* Make sure strdup() is in string.h */
 
-#include "pm_c_util.h"
+#include "netpbm/pm_c_util.h"
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
 
-#include "nstring.h"
+#include "netpbm/nstring.h"
+
 #include "colorname.h"
 
 static int lineNo;
diff --git a/lib/libpam.c b/lib/libpam.c
index 2d82ffef..0de9822e 100644
--- a/lib/libpam.c
+++ b/lib/libpam.c
@@ -23,9 +23,10 @@
 
 #include <math.h>
 
-#include "pm_c_util.h"
-#include "mallocvar.h"
-#include "nstring.h"
+#include "netpbm/pm_c_util.h"
+#include "netpbm/mallocvar.h"
+#include "netpbm/nstring.h"
+
 #include "pam.h"
 #include "ppm.h"
 #include "libpbm.h"
diff --git a/lib/libpamcolor.c b/lib/libpamcolor.c
index f945c0a5..f3ca9a86 100644
--- a/lib/libpamcolor.c
+++ b/lib/libpamcolor.c
@@ -20,11 +20,13 @@
 #include <string.h>
 #include <limits.h>
 
-#include "pm_c_util.h"
+#include "netpbm/pm_c_util.h"
+
 #include "pam.h"
 #include "ppm.h"
 
 
+
 tuple
 pnm_parsecolor(const char * const colorname,
                sample       const maxval) {
diff --git a/lib/libpamd.c b/lib/libpamd.c
index 77c7fc54..952150b4 100644
--- a/lib/libpamd.c
+++ b/lib/libpamd.c
@@ -20,9 +20,10 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "pm_config.h"
-#include "pm_c_util.h"
-#include "mallocvar.h"
+#include "netpbm/pm_config.h"
+#include "netpbm/pm_c_util.h"
+#include "netpbm/mallocvar.h"
+
 #include "pam.h"
 #include "ppmdfont.h"
 
diff --git a/lib/libpammap.c b/lib/libpammap.c
index ef373e81..55e1d3ff 100644
--- a/lib/libpammap.c
+++ b/lib/libpammap.c
@@ -17,9 +17,10 @@
 
 #include <assert.h>
 
-#include "pm_c_util.h"
-#include "mallocvar.h"
-#include "nstring.h"
+#include "netpbm/pm_c_util.h"
+#include "netpbm/mallocvar.h"
+#include "netpbm/nstring.h"
+
 #include "pam.h"
 #include "pammap.h"
 
diff --git a/lib/libpamn.c b/lib/libpamn.c
index b30bde53..26dbbfe3 100644
--- a/lib/libpamn.c
+++ b/lib/libpamn.c
@@ -11,9 +11,10 @@
 
 #include <assert.h>
 
-#include "pm_c_util.h"
-#include "mallocvar.h"
-#include "nstring.h"
+#include "netpbm/pm_c_util.h"
+#include "netpbm/mallocvar.h"
+#include "netpbm/nstring.h"
+
 #include "pam.h"
 #include "fileio.h"
 #include "pm_gamma.h"
diff --git a/lib/libpamread.c b/lib/libpamread.c
index cbac18c1..74b1ab83 100644
--- a/lib/libpamread.c
+++ b/lib/libpamread.c
@@ -19,9 +19,10 @@
 #include <limits.h>
 #include <assert.h>
 
-#include "pm_config.h"
+#include "netpbm/pm_config.h"
+#include "netpbm/nstring.h"
+
 #include "fileio.h"
-#include "nstring.h"
 #include "pam.h"
 
 
diff --git a/lib/libpamwrite.c b/lib/libpamwrite.c
index 9f86e359..29ddeaa2 100644
--- a/lib/libpamwrite.c
+++ b/lib/libpamwrite.c
@@ -21,8 +21,9 @@
 #include <assert.h>
 #include <math.h>
 
-#include "pm_config.h"
-#include "pm_c_util.h"
+#include "netpbm/pm_config.h"
+#include "netpbm/pm_c_util.h"
+
 #include "pam.h"
 
 
diff --git a/lib/libpbm1.c b/lib/libpbm1.c
index c96779ed..49ab7fdf 100644
--- a/lib/libpbm1.c
+++ b/lib/libpbm1.c
@@ -18,9 +18,10 @@
 
 #include <stdio.h>
 
-#include "pm_c_util.h"
-#include "mallocvar.h"
-#include "shhopt.h"
+#include "netpbm/pm_c_util.h"
+#include "netpbm/mallocvar.h"
+#include "netpbm/shhopt.h"
+
 #include "pbm.h"
 
 
diff --git a/lib/libpbm3.c b/lib/libpbm3.c
index 020e1558..c8389824 100644
--- a/lib/libpbm3.c
+++ b/lib/libpbm3.c
@@ -12,7 +12,8 @@
 
 #include <assert.h>
 
-#include "pm_c_util.h"
+#include "netpbm/pm_c_util.h"
+
 #include "pbm.h"
 
 #ifndef PACKBITS_SSE
diff --git a/lib/libpbmfont.c b/lib/libpbmfont.c
index 68b1ffb4..86a713aa 100644
--- a/lib/libpbmfont.c
+++ b/lib/libpbmfont.c
@@ -18,9 +18,10 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "pm_c_util.h"
-#include "mallocvar.h"
-#include "nstring.h"
+#include "netpbm/pm_c_util.h"
+#include "netpbm/mallocvar.h"
+#include "netpbm/nstring.h"
+
 #include "pbmfont.h"
 #include "pbm.h"
 
diff --git a/lib/libpgm1.c b/lib/libpgm1.c
index de5aedde..9ef5d2c1 100644
--- a/lib/libpgm1.c
+++ b/lib/libpgm1.c
@@ -20,6 +20,9 @@
 #include <stdio.h>
 #include <errno.h>
 
+#include "netpbm/mallocvar.h"
+#include "netpbm/nstring.h"
+
 #include "pgm.h"
 #include "libpgm.h"
 #include "pbm.h"
@@ -27,8 +30,6 @@
 #include "pam.h"
 #include "libpam.h"
 #include "fileio.h"
-#include "mallocvar.h"
-#include "nstring.h"
 
 
 gray *
diff --git a/lib/libpgm2.c b/lib/libpgm2.c
index 21e5ef9a..80b5cf42 100644
--- a/lib/libpgm2.c
+++ b/lib/libpgm2.c
@@ -13,8 +13,8 @@
 #include <string.h>
 #include <errno.h>
 
-#include "pm_c_util.h"
-#include "mallocvar.h"
+#include "netpbm/pm_c_util.h"
+#include "netpbm/mallocvar.h"
 #include "pgm.h"
 
 
diff --git a/lib/libpm.c b/lib/libpm.c
index fa8ae4db..69fe1dbf 100644
--- a/lib/libpm.c
+++ b/lib/libpm.c
@@ -34,7 +34,7 @@
 #include "netpbm/shhopt.h"
 #include "compile.h"
 
-#include "netpbm/pm.h"
+#include "pm.h"
 
 /* The following are set by pm_init(), then used by subsequent calls to other
    pm_xxx() functions.
diff --git a/lib/libpnm1.c b/lib/libpnm1.c
index 045b7afc..adfacd03 100644
--- a/lib/libpnm1.c
+++ b/lib/libpnm1.c
@@ -13,6 +13,8 @@
 #include <string.h>
 #include <errno.h>
 
+#include "netpbm/mallocvar.h"
+
 #include "pnm.h"
 
 #include "ppm.h"
@@ -27,8 +29,6 @@
 #include "pam.h"
 #include "libpam.h"
 
-#include "mallocvar.h"
-
 
 
 xel *
diff --git a/lib/libpnm2.c b/lib/libpnm2.c
index 01ffa389..fa4bb8be 100644
--- a/lib/libpnm2.c
+++ b/lib/libpnm2.c
@@ -10,7 +10,7 @@
 ** implied warranty.
 */
 
-#include "pm_c_util.h"
+#include "netpbm/pm_c_util.h"
 
 #include "pnm.h"
 
@@ -20,6 +20,8 @@
 
 #include "pbm.h"
 
+
+
 void
 pnm_writepnminit(FILE * const fileP, 
                  int    const cols, 
diff --git a/lib/libppm1.c b/lib/libppm1.c
index 2e17e894..a3be5d3b 100644
--- a/lib/libppm1.c
+++ b/lib/libppm1.c
@@ -20,6 +20,8 @@
 #include <stdio.h>
 #include <errno.h>
 
+#include "netpbm/mallocvar.h"
+#include "netpbm/nstring.h"
 #include "ppm.h"
 #include "libppm.h"
 #include "pgm.h"
@@ -29,8 +31,6 @@
 #include "pam.h"
 #include "libpam.h"
 #include "fileio.h"
-#include "mallocvar.h"
-#include "nstring.h"
 
 
 pixel *
diff --git a/lib/libppm2.c b/lib/libppm2.c
index fd26d2d8..694ecdd7 100644
--- a/lib/libppm2.c
+++ b/lib/libppm2.c
@@ -14,8 +14,8 @@
 #include <errno.h>
 
 
-#include "pm_c_util.h"
-#include "mallocvar.h"
+#include "netpbm/pm_c_util.h"
+#include "netpbm/mallocvar.h"
 #include "ppm.h"
 
 void
diff --git a/lib/libppmcmap.c b/lib/libppmcmap.c
index 67a85ebf..f78d0516 100644
--- a/lib/libppmcmap.c
+++ b/lib/libppmcmap.c
@@ -12,10 +12,10 @@
 ** implied warranty.
 */
 
-#include "pm_config.h"
-#include "pm_c_util.h"
-#include "nstring.h"
-#include "mallocvar.h"
+#include "netpbm/pm_config.h"
+#include "netpbm/pm_c_util.h"
+#include "netpbm/nstring.h"
+#include "netpbm/mallocvar.h"
 #include "ppm.h"
 #include "ppmcmap.h"
 
diff --git a/lib/libppmcolor.c b/lib/libppmcolor.c
index 3d98f5e7..aee8fd83 100644
--- a/lib/libppmcolor.c
+++ b/lib/libppmcolor.c
@@ -17,9 +17,9 @@
 #include <string.h>
 #include <math.h>
 
-#include "pm_c_util.h"
-#include "mallocvar.h"
-#include "nstring.h"
+#include "netpbm/pm_c_util.h"
+#include "netpbm/mallocvar.h"
+#include "netpbm/nstring.h"
 #include "ppm.h"
 #include "colorname.h"
 
diff --git a/lib/libppmd.c b/lib/libppmd.c
index d6f08b37..262679ec 100644
--- a/lib/libppmd.c
+++ b/lib/libppmd.c
@@ -18,9 +18,9 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "pm_config.h"
-#include "pm_c_util.h"
-#include "mallocvar.h"
+#include "netpbm/pm_config.h"
+#include "netpbm/pm_c_util.h"
+#include "netpbm/mallocvar.h"
 #include "ppm.h"
 #include "ppmdfont.h"
 #include "ppmdraw.h"
diff --git a/lib/libppmfloyd.c b/lib/libppmfloyd.c
index ec6256ff..d2b9c7b1 100644
--- a/lib/libppmfloyd.c
+++ b/lib/libppmfloyd.c
@@ -22,9 +22,9 @@ do Floyd-Steinberg.
 ** implied warranty.
 */
 
+#include "netpbm/mallocvar.h"
 #include "ppm.h"
 #include "ppmfloyd.h"
-#include "mallocvar.h"
 
 
 
diff --git a/lib/libppmfuzzy.c b/lib/libppmfuzzy.c
index 2a54e896..f1573c68 100644
--- a/lib/libppmfuzzy.c
+++ b/lib/libppmfuzzy.c
@@ -5,8 +5,8 @@
   <kenan@unix.ba> in 2006.
 =============================================================================*/
 
-#include "pm_c_util.h"
-#include "nstring.h"
+#include "netpbm/pm_c_util.h"
+#include "netpbm/nstring.h"
 #include "ppm.h"
 
 typedef double fzLog;
diff --git a/lib/libsystem.c b/lib/libsystem.c
index d21d0403..77f874cb 100644
--- a/lib/libsystem.c
+++ b/lib/libsystem.c
@@ -24,8 +24,8 @@
 #include <signal.h>
 #include <sys/wait.h>
 
-#include "pm_c_util.h"
-#include "mallocvar.h"
+#include "netpbm/pm_c_util.h"
+#include "netpbm/mallocvar.h"
 #include "pm.h"
 #include "pm_system.h"
 
diff --git a/lib/path.c b/lib/path.c
index 79985109..82fd874c 100644
--- a/lib/path.c
+++ b/lib/path.c
@@ -10,8 +10,8 @@
 
 #include <assert.h>
 
-#include "pm_c_util.h"
-#include "mallocvar.h"
+#include "netpbm/pm_c_util.h"
+#include "netpbm/mallocvar.h"
 #include "ppm.h"
 #include "ppmdfont.h"
 #include "ppmdraw.h"
diff --git a/lib/pm.h b/lib/pm.h
index a24ea7bb..c2fbfcb5 100644
--- a/lib/pm.h
+++ b/lib/pm.h
@@ -23,7 +23,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "pm_c_util.h"
+#include "netpbm/pm_c_util.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/pmfileio.c b/lib/pmfileio.c
index a7f00ce5..dd2e3114 100644
--- a/lib/pmfileio.c
+++ b/lib/pmfileio.c
@@ -40,9 +40,9 @@
   #include <io.h>
 #endif
 
-#include "pm_c_util.h"
-#include "mallocvar.h"
-#include "nstring.h"
+#include "netpbm/pm_c_util.h"
+#include "netpbm/mallocvar.h"
+#include "netpbm/nstring.h"
 
 #include "pm.h"
 
diff --git a/lib/ppmdfont.c b/lib/ppmdfont.c
index c0db3f51..f64cd10f 100644
--- a/lib/ppmdfont.c
+++ b/lib/ppmdfont.c
@@ -3,8 +3,8 @@
 #include <errno.h>
 #include <string.h>
 
+#include "netpbm/mallocvar.h"
 #include "pm.h"
-#include "mallocvar.h"
 #include "ppmdfont.h"