Remove pm_c_util.h from sshopt.h

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

35 files changed, 40 insertions, 0 deletions

diff --git a/editor/pambackground.c b/editor/pambackground.c
index 8911adf0..2ee1afd5 100644
--- a/editor/pambackground.c
+++ b/editor/pambackground.c
@@ -1,3 +1,4 @@
+#include "pm_c_util.h"
 #include "mallocvar.h"
 #include "nstring.h"
 #include "shhopt.h"
diff --git a/editor/pamcomp.c b/editor/pamcomp.c
index 45220486..e27b8613 100644
--- a/editor/pamcomp.c
+++ b/editor/pamcomp.c
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <math.h>
 
+#include "pm_c_util.h"
 #include "mallocvar.h"
 #include "nstring.h"
 #include "shhopt.h"
diff --git a/editor/pamcut.c b/editor/pamcut.c
index d2d6170c..8d4c2240 100644
--- a/editor/pamcut.c
+++ b/editor/pamcut.c
@@ -12,6 +12,8 @@
 
 #include <limits.h>
 #include <assert.h>
+
+#include "pm_c_util.h"
 #include "pam.h"
 #include "shhopt.h"
 #include "mallocvar.h"
diff --git a/editor/pamdice.c b/editor/pamdice.c
index 4afb5f29..f72420ab 100644
--- a/editor/pamdice.c
+++ b/editor/pamdice.c
@@ -11,6 +11,7 @@
 
 #include <string.h>
 
+#include "pm_c_util.h"
 #include "pam.h"
 #include "shhopt.h"
 #include "nstring.h"
diff --git a/editor/pamdither.c b/editor/pamdither.c
index 5eb931a6..e084892c 100644
--- a/editor/pamdither.c
+++ b/editor/pamdither.c
@@ -8,6 +8,7 @@
   This is meant to replace Ppmdither by Christos Zoulas, 1991.
 =============================================================================*/
 
+#include "pm_c_util.h"
 #include "mallocvar.h"
 #include "shhopt.h"
 #include "pam.h"
diff --git a/editor/pamditherbw.c b/editor/pamditherbw.c
index 769a8d44..90e2abd5 100644
--- a/editor/pamditherbw.c
+++ b/editor/pamditherbw.c
@@ -13,6 +13,7 @@
 #include <assert.h>
 #include <string.h>
 
+#include "pm_c_util.h"
 #include "pam.h"
 #include "dithers.h"
 #include "mallocvar.h"
diff --git a/editor/pamflip.c b/editor/pamflip.c
index 87f57809..1c479e54 100644
--- a/editor/pamflip.c
+++ b/editor/pamflip.c
@@ -61,6 +61,7 @@
 #include <limits.h>
 #include <string.h>
 
+#include "pm_c_util.h"
 #include "pam.h"
 #include "shhopt.h"
 #include "mallocvar.h"
diff --git a/editor/pamfunc.c b/editor/pamfunc.c
index d380303a..b6e56e17 100644
--- a/editor/pamfunc.c
+++ b/editor/pamfunc.c
@@ -18,6 +18,7 @@
 
 ******************************************************************************/
 
+#include "pm_c_util.h"
 #include "mallocvar.h"
 #include "shhopt.h"
 #include "pam.h"
diff --git a/editor/pammasksharpen.c b/editor/pammasksharpen.c
index 009e4962..e61237ca 100644
--- a/editor/pammasksharpen.c
+++ b/editor/pammasksharpen.c
@@ -1,3 +1,4 @@
+#include "pm_c_util.h"
 #include "mallocvar.h"
 #include "shhopt.h"
 #include "pam.h"
diff --git a/editor/pamperspective.c b/editor/pamperspective.c
index 744f123c..6bf8314e 100644
--- a/editor/pamperspective.c
+++ b/editor/pamperspective.c
@@ -25,6 +25,7 @@
 #include <math.h>
 #include <string.h>
 
+#include "pm_c_util.h"
 #include "mallocvar.h"
 #include "shhopt.h"
 #include "pam.h"
diff --git a/editor/pamscale.c b/editor/pamscale.c
index 4f205064..69861e0e 100644
--- a/editor/pamscale.c
+++ b/editor/pamscale.c
@@ -30,6 +30,7 @@
 #include <string.h>
 #include <assert.h>
 
+#include "pm_c_util.h"
 #include "pam.h"
 #include "shhopt.h"
 #include "mallocvar.h"
diff --git a/editor/pamstretch.c b/editor/pamstretch.c
index 0e9e6abf..87c105f9 100644
--- a/editor/pamstretch.c
+++ b/editor/pamstretch.c
@@ -24,6 +24,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
+
+#include "pm_c_util.h"
 #include "pam.h"
 #include "shhopt.h"
 
diff --git a/editor/pamthreshold.c b/editor/pamthreshold.c
index 428b819d..c5f48147 100644
--- a/editor/pamthreshold.c
+++ b/editor/pamthreshold.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "pm_c_util.h"
 #include "mallocvar.h"
 #include "nstring.h"
 #include "shhopt.h"
diff --git a/editor/pamundice.c b/editor/pamundice.c
index 5c504356..89d8b6b5 100644
--- a/editor/pamundice.c
+++ b/editor/pamundice.c
@@ -12,6 +12,7 @@
 #include <assert.h>
 #include <string.h>
 
+#include "pm_c_util.h"
 #include "pam.h"
 #include "shhopt.h"
 #include "nstring.h"
diff --git a/editor/pbmclean.c b/editor/pbmclean.c
index 3ae3acfc..65b53e1c 100644
--- a/editor/pbmclean.c
+++ b/editor/pbmclean.c
@@ -6,6 +6,8 @@
  */
 
 #include <stdio.h>
+
+#include "pm_c_util.h"
 #include "pbm.h"
 #include "shhopt.h"
 
diff --git a/editor/pgmmedian.c b/editor/pgmmedian.c
index 9c423e26..f911475d 100644
--- a/editor/pgmmedian.c
+++ b/editor/pgmmedian.c
@@ -26,6 +26,7 @@
 */
 
 
+#include "pm_c_util.h"
 #include "pgm.h"
 #include "shhopt.h"
 #include "mallocvar.h"
diff --git a/editor/pnmcat.c b/editor/pnmcat.c
index ea622a34..3cf443bb 100644
--- a/editor/pnmcat.c
+++ b/editor/pnmcat.c
@@ -12,6 +12,7 @@
 
 #include <assert.h>
 
+#include "pm_c_util.h"
 #include "mallocvar.h"
 #include "shhopt.h"
 #include "bitarith.h"
diff --git a/editor/pnmcomp.c b/editor/pnmcomp.c
index 5a8b1d55..04bb5365 100644
--- a/editor/pnmcomp.c
+++ b/editor/pnmcomp.c
@@ -19,6 +19,7 @@
 #define _BSD_SOURCE    /* Make sure strcasecmp() is in string.h */
 #include <string.h>
 
+#include "pm_c_util.h"
 #include "pnm.h"
 #include "shhopt.h"
 #include "mallocvar.h"
diff --git a/editor/pnmconvol.c b/editor/pnmconvol.c
index 365f7931..031feb66 100644
--- a/editor/pnmconvol.c
+++ b/editor/pnmconvol.c
@@ -17,6 +17,7 @@
 
 /* A change history is at the bottom */
 
+#include "pm_c_util.h"
 #include "pnm.h"
 #include "shhopt.h"
 #include "mallocvar.h"
diff --git a/editor/pnmcrop.c b/editor/pnmcrop.c
index c2e07805..1abfc7d4 100644
--- a/editor/pnmcrop.c
+++ b/editor/pnmcrop.c
@@ -25,6 +25,7 @@
 #include <errno.h>
 #include <assert.h>
 
+#include "pm_c_util.h"
 #include "pnm.h"
 #include "shhopt.h"
 #include "mallocvar.h"
diff --git a/editor/pnmgamma.c b/editor/pnmgamma.c
index d3e0d18c..507afae9 100644
--- a/editor/pnmgamma.c
+++ b/editor/pnmgamma.c
@@ -13,6 +13,7 @@
 #include <math.h>
 #include <ctype.h>
 
+#include "pm_c_util.h"
 #include "mallocvar.h"
 #include "shhopt.h"
 #include "pnm.h"
diff --git a/editor/pnmhisteq.c b/editor/pnmhisteq.c
index 2c6893bd..1987efc3 100644
--- a/editor/pnmhisteq.c
+++ b/editor/pnmhisteq.c
@@ -12,6 +12,7 @@
 
 #include <string.h>
 
+#include "pm_c_util.h"
 #include "pnm.h"
 #include "shhopt.h"
 #include "mallocvar.h"
diff --git a/editor/pnmpad.c b/editor/pnmpad.c
index f1541e96..34672dc5 100644
--- a/editor/pnmpad.c
+++ b/editor/pnmpad.c
@@ -5,6 +5,7 @@
 #include <string.h>
 #include <stdio.h>
 
+#include "pm_c_util.h"
 #include "mallocvar.h"
 #include "shhopt.h"
 #include "pnm.h"
diff --git a/editor/pnmrotate.c b/editor/pnmrotate.c
index a8cf62b0..ba37f4e0 100644
--- a/editor/pnmrotate.c
+++ b/editor/pnmrotate.c
@@ -15,6 +15,7 @@
 #include <math.h>
 #include <assert.h>
 
+#include "pm_c_util.h"
 #include "mallocvar.h"
 #include "shhopt.h"
 #include "ppm.h"
diff --git a/editor/pnmscalefixed.c b/editor/pnmscalefixed.c
index d562c670..8deb65d7 100644
--- a/editor/pnmscalefixed.c
+++ b/editor/pnmscalefixed.c
@@ -20,6 +20,8 @@
 */
  
 #include <math.h>
+
+#include "pm_c_util.h"
 #include "pnm.h"
 #include "shhopt.h"
 
diff --git a/editor/pnmshear.c b/editor/pnmshear.c
index 9fd788a5..d85658e5 100644
--- a/editor/pnmshear.c
+++ b/editor/pnmshear.c
@@ -16,6 +16,7 @@
 #include <math.h>
 #include <string.h>
 
+#include "pm_c_util.h"
 #include "ppm.h"
 #include "pnm.h"
 #include "shhopt.h"
diff --git a/editor/pnmtile.c b/editor/pnmtile.c
index 4dcdfbfe..26728055 100644
--- a/editor/pnmtile.c
+++ b/editor/pnmtile.c
@@ -10,6 +10,7 @@
 ** implied warranty.
 */
 
+#include "pm_c_util.h"
 #include "mallocvar.h"
 #include "shhopt.h"
 #include "pnm.h"
diff --git a/editor/ppmbrighten.c b/editor/ppmbrighten.c
index 1dcdbd7f..9bcf7bb5 100644
--- a/editor/ppmbrighten.c
+++ b/editor/ppmbrighten.c
@@ -11,6 +11,7 @@
 ** implied warranty.
 */
 
+#include "pm_c_util.h"
 #include "ppm.h"
 #include "shhopt.h"
 #include "mallocvar.h"
diff --git a/editor/ppmchange.c b/editor/ppmchange.c
index 1b1aa3ca..f0d2cc38 100644
--- a/editor/ppmchange.c
+++ b/editor/ppmchange.c
@@ -13,6 +13,7 @@
 **     28 Jan 94 -  Added multiple color substitution function.
 */
 
+#include "pm_c_util.h"
 #include "ppm.h"
 #include "shhopt.h"
 #include "mallocvar.h"
diff --git a/editor/specialty/pamdeinterlace.c b/editor/specialty/pamdeinterlace.c
index 9ed1d8eb..f158fbac 100644
--- a/editor/specialty/pamdeinterlace.c
+++ b/editor/specialty/pamdeinterlace.c
@@ -8,6 +8,7 @@
   Contributed to the public domain.
 ******************************************************************************/
 
+#include "pm_c_util.h"
 #include "pam.h"
 #include "shhopt.h"
 #include "mallocvar.h"
diff --git a/editor/specialty/pammixinterlace.c b/editor/specialty/pammixinterlace.c
index f22563f6..9f98b406 100644
--- a/editor/specialty/pammixinterlace.c
+++ b/editor/specialty/pammixinterlace.c
@@ -18,6 +18,7 @@
 
 #include <string.h>
 
+#include "pm_c_util.h"
 #include "mallocvar.h"
 #include "nstring.h"
 #include "shhopt.h"
diff --git a/editor/specialty/pnmindex.c b/editor/specialty/pnmindex.c
index 7b405ef3..ca1da18c 100644
--- a/editor/specialty/pnmindex.c
+++ b/editor/specialty/pnmindex.c
@@ -24,6 +24,7 @@
 
 
 #include "pm_config.h"
+#include "pm_c_util.h"
 #include "shhopt.h"
 #include "mallocvar.h"
 #include "nstring.h"
diff --git a/editor/specialty/ppm3d.c b/editor/specialty/ppm3d.c
index 6f317a0b..d9ada365 100644
--- a/editor/specialty/ppm3d.c
+++ b/editor/specialty/ppm3d.c
@@ -8,6 +8,7 @@
 
 #include <assert.h>
 
+#include "pm_c_util.h"
 #include "shhopt.h"
 #include "mallocvar.h"
 #include "ppm.h"
diff --git a/editor/specialty/ppmglobe.c b/editor/specialty/ppmglobe.c
index ee1a57c3..82fae5fb 100644
--- a/editor/specialty/ppmglobe.c
+++ b/editor/specialty/ppmglobe.c
@@ -15,6 +15,7 @@
 #include <unistd.h>
 #include <math.h>
 
+#include "pm_c_util.h"
 #include "ppm.h"
 #include "colorname.h"
 #include "shhopt.h"
diff --git a/editor/specialty/ppmntsc.c b/editor/specialty/ppmntsc.c
index b9f2ac2f..ae3bcfe9 100644
--- a/editor/specialty/ppmntsc.c
+++ b/editor/specialty/ppmntsc.c
@@ -45,6 +45,8 @@
 #include <stdio.h>
 #include <math.h>
 #include <string.h>
+
+#include "pm_c_util.h"
 #include "ppm.h"
 #include "mallocvar.h"
 #include "shhopt.h"