diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2009-04-04 20:59:01 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2009-04-04 20:59:01 +0000 |
| commit | e7537327685c49c724dd8f7e57cfe52ad10c15e8 (patch) | |
| tree | abf4f125b939d06d2e369eb2ca09191baa492e7c | |
| parent | b0528cd8ea2a8527c4bbae5176c8f69fd0104769 (diff) | |
| download | netpbm-mirror-e7537327685c49c724dd8f7e57cfe52ad10c15e8.tar.gz netpbm-mirror-e7537327685c49c724dd8f7e57cfe52ad10c15e8.tar.xz netpbm-mirror-e7537327685c49c724dd8f7e57cfe52ad10c15e8.zip | |
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
127 files changed, 155 insertions, 14 deletions
diff --git a/analyzer/pamfile.c b/analyzer/pamfile.c index efb2cbee..4fa81330 100644 --- a/analyzer/pamfile.c +++ b/analyzer/pamfile.c @@ -10,6 +10,7 @@ ** implied warranty. */ +#include "pm_c_util.h" #include "mallocvar.h" #include "nstring.h" #include "shhopt.h" diff --git a/analyzer/pamsharpmap.c b/analyzer/pamsharpmap.c index 8a08f981..ddeefe14 100644 --- a/analyzer/pamsharpmap.c +++ b/analyzer/pamsharpmap.c @@ -20,6 +20,7 @@ #include <stdio.h> #include <math.h> +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/analyzer/pamsharpness.c b/analyzer/pamsharpness.c index 2cb5edb9..c0fc82ee 100644 --- a/analyzer/pamsharpness.c +++ b/analyzer/pamsharpness.c @@ -20,6 +20,7 @@ #include <stdio.h> #include <math.h> +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" diff --git a/analyzer/pamslice.c b/analyzer/pamslice.c index fc63a2cc..ab372c8a 100644 --- a/analyzer/pamslice.c +++ b/analyzer/pamslice.c @@ -22,6 +22,7 @@ enum orientation {ROW, COLUMN}; +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" diff --git a/analyzer/pamsumm.c b/analyzer/pamsumm.c index 390b8ebb..c9b8a7bf 100644 --- a/analyzer/pamsumm.c +++ b/analyzer/pamsumm.c @@ -10,6 +10,7 @@ ******************************************************************************/ +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/analyzer/pamtilt.c b/analyzer/pamtilt.c index 2aa65df8..b1e3df58 100644 --- a/analyzer/pamtilt.c +++ b/analyzer/pamtilt.c @@ -15,6 +15,7 @@ #include <assert.h> #include <math.h> +#include "pm_c_util.h" #include "pam.h" #include "mallocvar.h" #include "shhopt.h" diff --git a/analyzer/pgmhist.c b/analyzer/pgmhist.c index 13f5b1ce..ede41e0d 100644 --- a/analyzer/pgmhist.c +++ b/analyzer/pgmhist.c @@ -13,6 +13,7 @@ #include <assert.h> #include <limits.h> +#include "pm_c_util.h" #include "mallocvar.h" #include "shhopt.h" #include "pgm.h" diff --git a/analyzer/pnmhistmap.c b/analyzer/pnmhistmap.c index a7ed6b10..ffcc08f5 100644 --- a/analyzer/pnmhistmap.c +++ b/analyzer/pnmhistmap.c @@ -19,6 +19,7 @@ #include <string.h> +#include "pm_c_util.h" #include "pnm.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/analyzer/ppmhist.c b/analyzer/ppmhist.c index d27c49dd..673c8175 100644 --- a/analyzer/ppmhist.c +++ b/analyzer/ppmhist.c @@ -12,6 +12,7 @@ #include <assert.h> +#include "pm_c_util.h" #include "mallocvar.h" #include "nstring.h" #include "shhopt.h" diff --git a/converter/other/bmptopnm.c b/converter/other/bmptopnm.c index 69f17bcc..3c8adcf0 100644 --- a/converter/other/bmptopnm.c +++ b/converter/other/bmptopnm.c @@ -27,6 +27,7 @@ #include <limits.h> #include <assert.h> +#include "pm_c_util.h" #include "pnm.h" #include "shhopt.h" #include "nstring.h" diff --git a/converter/other/cameratopam/cameratopam.c b/converter/other/cameratopam/cameratopam.c index f2c6d78c..b2d6da9b 100644 --- a/converter/other/cameratopam/cameratopam.c +++ b/converter/other/cameratopam/cameratopam.c @@ -30,6 +30,7 @@ #include <unistd.h> #endif +#include "pm_c_util.h" #include "mallocvar.h" #include "shhopt.h" #include "pam.h" diff --git a/converter/other/giftopnm.c b/converter/other/giftopnm.c index a79a0bbe..df049bf3 100644 --- a/converter/other/giftopnm.c +++ b/converter/other/giftopnm.c @@ -23,6 +23,7 @@ #include <string.h> #include <assert.h> +#include "pm_c_util.h" #include "mallocvar.h" #include "nstring.h" #include "shhopt.h" diff --git a/converter/other/hdifftopam.c b/converter/other/hdifftopam.c index 48282526..7bfeed9b 100644 --- a/converter/other/hdifftopam.c +++ b/converter/other/hdifftopam.c @@ -9,6 +9,7 @@ #include <string.h> #include <stdio.h> +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" #include "nstring.h" diff --git a/converter/other/infotopam.c b/converter/other/infotopam.c index 4f29eb07..21fa8ee2 100644 --- a/converter/other/infotopam.c +++ b/converter/other/infotopam.c @@ -65,6 +65,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/converter/other/jpeg2000/jpeg2ktopam.c b/converter/other/jpeg2000/jpeg2ktopam.c index e11e9fb4..e6db7658 100644 --- a/converter/other/jpeg2000/jpeg2ktopam.c +++ b/converter/other/jpeg2000/jpeg2ktopam.c @@ -13,6 +13,7 @@ #define _XOPEN_SOURCE 600 #include <string.h> +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" #include "nstring.h" diff --git a/converter/other/jpeg2000/pamtojpeg2k.c b/converter/other/jpeg2000/pamtojpeg2k.c index 851d2bf9..70774725 100644 --- a/converter/other/jpeg2000/pamtojpeg2k.c +++ b/converter/other/jpeg2000/pamtojpeg2k.c @@ -13,6 +13,7 @@ #define _XOPEN_SOURCE 600 #include <string.h> +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" #include "nstring.h" diff --git a/converter/other/jpegtopnm.c b/converter/other/jpegtopnm.c index 4679d497..07a7dfb0 100644 --- a/converter/other/jpegtopnm.c +++ b/converter/other/jpegtopnm.c @@ -61,6 +61,8 @@ itself, but doesn't. */ #include <jpeglib.h> + +#include "pm_c_util.h" #include "pnm.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/converter/other/pamtodjvurle.c b/converter/other/pamtodjvurle.c index fecf410e..2d26eeb0 100644 --- a/converter/other/pamtodjvurle.c +++ b/converter/other/pamtodjvurle.c @@ -16,6 +16,7 @@ #include <stdio.h> #include <assert.h> +#include "pm_c_util.h" #include "pam.h" #include "pammap.h" #include "shhopt.h" diff --git a/converter/other/pamtofits.c b/converter/other/pamtofits.c index 7a71ff56..7a1c70de 100644 --- a/converter/other/pamtofits.c +++ b/converter/other/pamtofits.c @@ -30,6 +30,7 @@ #include <string.h> #include <stdio.h> +#include "pm_c_util.h" #include "mallocvar.h" #include "shhopt.h" #include "nstring.h" diff --git a/converter/other/pamtogif.c b/converter/other/pamtogif.c index edaf0695..b8df9626 100644 --- a/converter/other/pamtogif.c +++ b/converter/other/pamtogif.c @@ -9,6 +9,7 @@ #include <assert.h> #include <string.h> +#include "pm_c_util.h" #include "mallocvar.h" #include "shhopt.h" #include "nstring.h" diff --git a/converter/other/pamtohdiff.c b/converter/other/pamtohdiff.c index 0e1ff00f..2d5f6a61 100644 --- a/converter/other/pamtohdiff.c +++ b/converter/other/pamtohdiff.c @@ -16,6 +16,7 @@ #include <string.h> #include <stdio.h> +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" diff --git a/converter/other/pamtohtmltbl.c b/converter/other/pamtohtmltbl.c index 70aa3b2d..5335ff9f 100644 --- a/converter/other/pamtohtmltbl.c +++ b/converter/other/pamtohtmltbl.c @@ -2,6 +2,7 @@ #include <stdlib.h> #include <string.h> +#include "pm_c_util.h" #include "mallocvar.h" #include "shhopt.h" #include "pam.h" diff --git a/converter/other/pamtompfont.c b/converter/other/pamtompfont.c index b8d11aea..f755dfef 100644 --- a/converter/other/pamtompfont.c +++ b/converter/other/pamtompfont.c @@ -21,6 +21,7 @@ #include <string.h> #include <assert.h> +#include "pm_c_util.h" #include "mallocvar.h" #include "shhopt.h" #include "pm.h" diff --git a/converter/other/pamtopfm.c b/converter/other/pamtopfm.c index ee44eeb5..129b8eee 100644 --- a/converter/other/pamtopfm.c +++ b/converter/other/pamtopfm.c @@ -15,6 +15,7 @@ #include <string.h> #include <assert.h> +#include "pm_c_util.h" #include "pam.h" #include "pm_gamma.h" #include "shhopt.h" diff --git a/converter/other/pamtopnm.c b/converter/other/pamtopnm.c index 6835b43f..86f6514c 100644 --- a/converter/other/pamtopnm.c +++ b/converter/other/pamtopnm.c @@ -12,6 +12,7 @@ #include <string.h> +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/converter/other/pamtosvg/pamtosvg.c b/converter/other/pamtosvg/pamtosvg.c index 36f69b59..dbe67c74 100644 --- a/converter/other/pamtosvg/pamtosvg.c +++ b/converter/other/pamtosvg/pamtosvg.c @@ -4,6 +4,7 @@ #include <assert.h> #include <math.h> +#include "pm_c_util.h" #include "mallocvar.h" #include "nstring.h" #include "shhopt.h" diff --git a/converter/other/pamtotga.c b/converter/other/pamtotga.c index addd2d91..c23b92b1 100644 --- a/converter/other/pamtotga.c +++ b/converter/other/pamtotga.c @@ -15,6 +15,7 @@ #include <string.h> +#include "pm_c_util.h" #include "pam.h" #include "pammap.h" #include "shhopt.h" diff --git a/converter/other/pamtouil.c b/converter/other/pamtouil.c index 3e67da7d..209ebf16 100644 --- a/converter/other/pamtouil.c +++ b/converter/other/pamtouil.c @@ -17,6 +17,8 @@ #define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ #include <ctype.h> #include <string.h> + +#include "pm_c_util.h" #include "pam.h" #include "pammap.h" #include "colorname.h" diff --git a/converter/other/pfmtopam.c b/converter/other/pfmtopam.c index 9430f5fa..1617ed31 100644 --- a/converter/other/pfmtopam.c +++ b/converter/other/pfmtopam.c @@ -15,6 +15,7 @@ #include <string.h> #include <assert.h> +#include "pm_c_util.h" #include "pam.h" #include "pm_gamma.h" #include "shhopt.h" diff --git a/converter/other/pgmtopbm.c b/converter/other/pgmtopbm.c index 34cc2c91..f828b716 100644 --- a/converter/other/pgmtopbm.c +++ b/converter/other/pgmtopbm.c @@ -12,6 +12,7 @@ #include <assert.h> +#include "pm_c_util.h" #include "shhopt.h" #include "pgm.h" #include "dithers.h" diff --git a/converter/other/pgmtoppm.c b/converter/other/pgmtoppm.c index 12bc7d25..7194db49 100644 --- a/converter/other/pgmtoppm.c +++ b/converter/other/pgmtoppm.c @@ -13,6 +13,7 @@ #define _BSD_SOURCE /* Make sure strdup() is in <string.h> */ #include <string.h> +#include "pm_c_util.h" #include "mallocvar.h" #include "shhopt.h" #include "ppm.h" diff --git a/converter/other/pngtopam.c b/converter/other/pngtopam.c index 3039c769..b3f934c7 100644 --- a/converter/other/pngtopam.c +++ b/converter/other/pngtopam.c @@ -24,6 +24,7 @@ #include <png.h> /* includes zlib.h and setjmp.h */ #define VERSION "2.37.4 (5 December 1999) +netpbm" +#include "pm_c_util.h" #include "mallocvar.h" #include "nstring.h" #include "shhopt.h" diff --git a/converter/other/pngtopnm.c b/converter/other/pngtopnm.c index 8ffff617..fe32f641 100644 --- a/converter/other/pngtopnm.c +++ b/converter/other/pngtopnm.c @@ -25,6 +25,7 @@ #include <png.h> /* includes zlib.h and setjmp.h */ #define VERSION "2.37.4 (5 December 1999) +netpbm" +#include "pm_c_util.h" #include "mallocvar.h" #include "nstring.h" #include "shhopt.h" diff --git a/converter/other/pnmtojpeg.c b/converter/other/pnmtojpeg.c index 3110542d..198aa156 100644 --- a/converter/other/pnmtojpeg.c +++ b/converter/other/pnmtojpeg.c @@ -29,6 +29,8 @@ itself, but doesn't. */ #include <jpeglib.h> + +#include "pm_c_util.h" #include "pnm.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/converter/other/pnmtopalm/palmtopnm.c b/converter/other/pnmtopalm/palmtopnm.c index 9cd695e3..d66af69b 100644 --- a/converter/other/pnmtopalm/palmtopnm.c +++ b/converter/other/pnmtopalm/palmtopnm.c @@ -15,6 +15,7 @@ #include <string.h> #include <assert.h> +#include "pm_c_util.h" #include "pnm.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/converter/other/pnmtopalm/pnmtopalm.c b/converter/other/pnmtopalm/pnmtopalm.c index f5f6e44a..3d20788c 100644 --- a/converter/other/pnmtopalm/pnmtopalm.c +++ b/converter/other/pnmtopalm/pnmtopalm.c @@ -21,6 +21,7 @@ #include <assert.h> #include <limits.h> +#include "pm_c_util.h" #include "pnm.h" #include "palm.h" #include "shhopt.h" diff --git a/converter/other/pnmtopclxl.c b/converter/other/pnmtopclxl.c index 9819ebe4..34f7065d 100644 --- a/converter/other/pnmtopclxl.c +++ b/converter/other/pnmtopclxl.c @@ -29,6 +29,7 @@ #include <sys/types.h> #include <ctype.h> +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/converter/other/pnmtopng.c b/converter/other/pnmtopng.c index 72177507..6d1b0efc 100644 --- a/converter/other/pnmtopng.c +++ b/converter/other/pnmtopng.c @@ -60,6 +60,8 @@ #include <string.h> /* strcat() */ #include <limits.h> #include <png.h> /* includes zlib.h and setjmp.h */ + +#include "pm_c_util.h" #include "pnm.h" #include "pngtxt.h" #include "shhopt.h" diff --git a/converter/other/pnmtops.c b/converter/other/pnmtops.c index 410fa0b9..b43cb483 100644 --- a/converter/other/pnmtops.c +++ b/converter/other/pnmtops.c @@ -34,6 +34,8 @@ #include <string.h> #include <assert.h> + +#include "pm_c_util.h" #include "pam.h" #include "mallocvar.h" #include "shhopt.h" diff --git a/converter/other/pnmtoxwd.c b/converter/other/pnmtoxwd.c index d0625b0b..b6439d28 100644 --- a/converter/other/pnmtoxwd.c +++ b/converter/other/pnmtoxwd.c @@ -11,6 +11,8 @@ */ #include <string.h> + +#include "pm_c_util.h" #include "pnm.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/converter/other/pstopnm.c b/converter/other/pstopnm.c index f99478db..ba1470b0 100644 --- a/converter/other/pstopnm.c +++ b/converter/other/pstopnm.c @@ -26,6 +26,7 @@ #include <sys/wait.h> #include <sys/stat.h> +#include "pm_c_util.h" #include "pnm.h" #include "shhopt.h" #include "nstring.h" diff --git a/converter/other/rlatopam.c b/converter/other/rlatopam.c index ae1326ca..703c4820 100644 --- a/converter/other/rlatopam.c +++ b/converter/other/rlatopam.c @@ -16,6 +16,7 @@ #include <string.h> #include <errno.h> +#include "pm_c_util.h" #include "shhopt.h" #include "mallocvar.h" #include "pam.h" diff --git a/converter/other/rletopnm.c b/converter/other/rletopnm.c index f98ea8a8..83ada51b 100644 --- a/converter/other/rletopnm.c +++ b/converter/other/rletopnm.c @@ -46,6 +46,7 @@ #define NO_DECLARE_MALLOC #include <rle.h> +#include "pm_c_util.h" #include "pnm.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/converter/other/tifftopnm.c b/converter/other/tifftopnm.c index fe0de2d7..a8c0fe1d 100644 --- a/converter/other/tifftopnm.c +++ b/converter/other/tifftopnm.c @@ -53,6 +53,7 @@ #include <string.h> #include <stdio.h> +#include "pm_c_util.h" #include "shhopt.h" #include "mallocvar.h" #include "nstring.h" diff --git a/converter/pbm/g3topbm.c b/converter/pbm/g3topbm.c index 3858dc7a..66cd9f9e 100644 --- a/converter/pbm/g3topbm.c +++ b/converter/pbm/g3topbm.c @@ -20,6 +20,7 @@ #define _BSD_SOURCE /* Make nstring.h define strcaseeq() */ +#include "pm_c_util.h" #include "pbm.h" #include "shhopt.h" #include "nstring.h" diff --git a/converter/pbm/pbmtoepsi.c b/converter/pbm/pbmtoepsi.c index fc8cee7d..b770a7c4 100644 --- a/converter/pbm/pbmtoepsi.c +++ b/converter/pbm/pbmtoepsi.c @@ -16,6 +16,7 @@ ** implied warranty. */ +#include "pm_c_util.h" #include "pbm.h" #include "shhopt.h" diff --git a/converter/pbm/pbmtoepson.c b/converter/pbm/pbmtoepson.c index d26734d4..b485d888 100644 --- a/converter/pbm/pbmtoepson.c +++ b/converter/pbm/pbmtoepson.c @@ -16,8 +16,9 @@ #include <stdio.h> #include <string.h> -#include "shhopt.h" +#include "pm_c_util.h" #include "mallocvar.h" +#include "shhopt.h" #include "pbm.h" diff --git a/converter/pbm/pbmtoescp2.c b/converter/pbm/pbmtoescp2.c index 787f7027..973c8781 100644 --- a/converter/pbm/pbmtoescp2.c +++ b/converter/pbm/pbmtoescp2.c @@ -16,6 +16,7 @@ #include <string.h> +#include "pm_c_util.h" #include "pbm.h" #include "shhopt.h" diff --git a/converter/pbm/pbmtog3.c b/converter/pbm/pbmtog3.c index 3fe7f3fc..44d9a26b 100644 --- a/converter/pbm/pbmtog3.c +++ b/converter/pbm/pbmtog3.c @@ -18,12 +18,13 @@ #include <assert.h> -#include "pbm.h" +#include "pm_c_util.h" #include "shhopt.h" #include "mallocvar.h" #include "bitreverse.h" #include "wordaccess.h" #include "g3.h" +#include "pbm.h" #define TC_MC 64 diff --git a/converter/pbm/pbmtoibm23xx.c b/converter/pbm/pbmtoibm23xx.c index 973f7de0..a83e260d 100644 --- a/converter/pbm/pbmtoibm23xx.c +++ b/converter/pbm/pbmtoibm23xx.c @@ -46,6 +46,7 @@ #include <stdlib.h> #include <string.h> +#include "pm_c_util.h" #include "pbm.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/converter/pbm/pbmtolj.c b/converter/pbm/pbmtolj.c index e8373050..be28f635 100644 --- a/converter/pbm/pbmtolj.c +++ b/converter/pbm/pbmtolj.c @@ -27,6 +27,7 @@ ** implied warranty. */ +#include "pm_c_util.h" #include "pbm.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/converter/pbm/pbmtopsg3.c b/converter/pbm/pbmtopsg3.c index 68b265f0..54d0a0a0 100644 --- a/converter/pbm/pbmtopsg3.c +++ b/converter/pbm/pbmtopsg3.c @@ -26,6 +26,7 @@ #include <unistd.h> #include <ctype.h> +#include "pm_c_util.h" #include "pbm.h" #include "shhopt.h" diff --git a/converter/pbm/pbmtoxbm.c b/converter/pbm/pbmtoxbm.c index 0051194c..937e56c5 100644 --- a/converter/pbm/pbmtoxbm.c +++ b/converter/pbm/pbmtoxbm.c @@ -25,6 +25,7 @@ #include <string.h> +#include "pm_c_util.h" #include "pbm.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/converter/pgm/rawtopgm.c b/converter/pgm/rawtopgm.c index 4eac91d2..0180a02c 100644 --- a/converter/pgm/rawtopgm.c +++ b/converter/pgm/rawtopgm.c @@ -11,6 +11,8 @@ */ #include <math.h> + +#include "pm_c_util.h" #include "pgm.h" #include "shhopt.h" diff --git a/converter/ppm/411toppm.c b/converter/ppm/411toppm.c index a5b25ac1..6ece4c4b 100644 --- a/converter/ppm/411toppm.c +++ b/converter/ppm/411toppm.c @@ -58,6 +58,7 @@ #include <stdio.h> #include <stdlib.h> +#include "pm_c_util.h" #include "ppm.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/converter/ppm/eyuvtoppm.c b/converter/ppm/eyuvtoppm.c index dcbb9547..33d57409 100644 --- a/converter/ppm/eyuvtoppm.c +++ b/converter/ppm/eyuvtoppm.c @@ -34,6 +34,8 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> + +#include "pm_c_util.h" #include "ppm.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/converter/ppm/pcxtoppm.c b/converter/ppm/pcxtoppm.c index 9f403538..25a81531 100644 --- a/converter/ppm/pcxtoppm.c +++ b/converter/ppm/pcxtoppm.c @@ -31,6 +31,7 @@ * - moved check of 16-color-palette into pcx_16col_to_ppm(), * now checks if it contains only a single color */ +#include "pm_c_util.h" #include "mallocvar.h" #include "shhopt.h" #include "ppm.h" diff --git a/converter/ppm/ppmtobmp.c b/converter/ppm/ppmtobmp.c index 0e7a8328..9075ad6d 100644 --- a/converter/ppm/ppmtobmp.c +++ b/converter/ppm/ppmtobmp.c @@ -19,6 +19,7 @@ #include <assert.h> #include <string.h> +#include "pm_c_util.h" #include "mallocvar.h" #include "shhopt.h" #include "bmp.h" diff --git a/converter/ppm/ppmtogif.c b/converter/ppm/ppmtogif.c index 2718af88..93feaa95 100644 --- a/converter/ppm/ppmtogif.c +++ b/converter/ppm/ppmtogif.c @@ -19,6 +19,7 @@ #include <sys/stat.h> #include <unistd.h> +#include "pm_c_util.h" #include "mallocvar.h" #include "shhopt.h" #include "nstring.h" diff --git a/converter/ppm/ppmtopcx.c b/converter/ppm/ppmtopcx.c index bdcfc5c7..edc44149 100644 --- a/converter/ppm/ppmtopcx.c +++ b/converter/ppm/ppmtopcx.c @@ -15,6 +15,7 @@ */ #include <assert.h> +#include "pm_c_util.h" #include "ppm.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/converter/ppm/ppmtoterm.c b/converter/ppm/ppmtoterm.c index 72105705..81df614e 100644 --- a/converter/ppm/ppmtoterm.c +++ b/converter/ppm/ppmtoterm.c @@ -21,6 +21,7 @@ #include <string.h> +#include "pm_c_util.h" #include "ppm.h" #include "shhopt.h" diff --git a/converter/ppm/ppmtowinicon.c b/converter/ppm/ppmtowinicon.c index bcaa0e08..1a8cc3a7 100644 --- a/converter/ppm/ppmtowinicon.c +++ b/converter/ppm/ppmtowinicon.c @@ -13,6 +13,7 @@ #include <math.h> #include <string.h> +#include "pm_c_util.h" #include "winico.h" #include "ppm.h" #include "mallocvar.h" diff --git a/converter/ppm/ppmtoxpm.c b/converter/ppm/ppmtoxpm.c index ae597125..18ea61a8 100644 --- a/converter/ppm/ppmtoxpm.c +++ b/converter/ppm/ppmtoxpm.c @@ -39,6 +39,8 @@ #include <stdio.h> #include <ctype.h> #include <string.h> + +#include "pm_c_util.h" #include "ppm.h" #include "shhopt.h" #include "nstring.h" diff --git a/converter/ppm/tgatoppm.c b/converter/ppm/tgatoppm.c index da1c3beb..f8538214 100644 --- a/converter/ppm/tgatoppm.c +++ b/converter/ppm/tgatoppm.c @@ -16,6 +16,8 @@ #define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ #include <string.h> + +#include "pm_c_util.h" #include "ppm.h" #include "tga.h" #include "shhopt.h" diff --git a/converter/ppm/winicontoppm.c b/converter/ppm/winicontoppm.c index 9a606a93..ad859c94 100644 --- a/converter/ppm/winicontoppm.c +++ b/converter/ppm/winicontoppm.c @@ -21,6 +21,7 @@ #include <string.h> #include <assert.h> +#include "pm_c_util.h" #include "ppm.h" #include "shhopt.h" #include "nstring.h" diff --git a/converter/ppm/ximtoppm.c b/converter/ppm/ximtoppm.c index bb842f02..98aad2d7 100644 --- a/converter/ppm/ximtoppm.c +++ b/converter/ppm/ximtoppm.c @@ -14,6 +14,8 @@ #define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ #include <string.h> + +#include "pm_c_util.h" #include "ppm.h" #include "xim.h" #include "shhopt.h" diff --git a/converter/ppm/xpmtoppm.c b/converter/ppm/xpmtoppm.c index 97be6cc9..5884d3d4 100644 --- a/converter/ppm/xpmtoppm.c +++ b/converter/ppm/xpmtoppm.c @@ -33,6 +33,7 @@ #include <string.h> +#include "pm_c_util.h" #include "ppm.h" #include "shhopt.h" #include "nstring.h" diff --git a/converter/ppm/yuvsplittoppm.c b/converter/ppm/yuvsplittoppm.c index 0f5e19a3..b3088812 100644 --- a/converter/ppm/yuvsplittoppm.c +++ b/converter/ppm/yuvsplittoppm.c @@ -20,6 +20,8 @@ */ #include <string.h> + +#include "pm_c_util.h" #include "ppm.h" #include "nstring.h" #include "shhopt.h" diff --git a/doc/HISTORY b/doc/HISTORY index 2e2a06d8..b9e3671c 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,13 @@ Netpbm. CHANGE HISTORY -------------- +not yet BJH Release 10.47.00 + + Remove nstring.h from exported interfaces. + + Fix: remove inclusion of pm_c_util.h from sshopt.h, which is + an exported interface header file, whereas pm_c_util.h is not. + 09.03.29 BJH Release 10.46.00 xwdtopnm: Add -cmapdump . 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" diff --git a/generator/pamgradient.c b/generator/pamgradient.c index bc278a6c..aa559d27 100644 --- a/generator/pamgradient.c +++ b/generator/pamgradient.c @@ -1,5 +1,6 @@ #include <string.h> +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/generator/pamseq.c b/generator/pamseq.c index 58419d12..98eac1cc 100644 --- a/generator/pamseq.c +++ b/generator/pamseq.c @@ -3,6 +3,7 @@ #include <stdlib.h> #include <stdio.h> +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" diff --git a/generator/pamstereogram.c b/generator/pamstereogram.c index 71c541df..d1673df5 100644 --- a/generator/pamstereogram.c +++ b/generator/pamstereogram.c @@ -50,6 +50,7 @@ #include <assert.h> #include "pm_config.h" +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/generator/pbmmake.c b/generator/pbmmake.c index 6c924ac1..41d80274 100644 --- a/generator/pbmmake.c +++ b/generator/pbmmake.c @@ -11,6 +11,7 @@ ** */ +#include "pm_c_util.h" #include "shhopt.h" #include "mallocvar.h" #include "pbm.h" diff --git a/generator/pbmtext.c b/generator/pbmtext.c index 7e1e7ea9..ed7f3542 100644 --- a/generator/pbmtext.c +++ b/generator/pbmtext.c @@ -17,6 +17,7 @@ #include <limits.h> #include <assert.h> +#include "pm_c_util.h" #include "mallocvar.h" #include "shhopt.h" #include "pbm.h" diff --git a/generator/pbmtextps.c b/generator/pbmtextps.c index a4c0b51d..f879fa88 100644 --- a/generator/pbmtextps.c +++ b/generator/pbmtextps.c @@ -23,6 +23,7 @@ #include <string.h> #include <errno.h> +#include "pm_c_util.h" #include "mallocvar.h" #include "nstring.h" #include "shhopt.h" diff --git a/generator/pgmnoise.c b/generator/pgmnoise.c index 9f6b98c8..215cbfeb 100644 --- a/generator/pgmnoise.c +++ b/generator/pgmnoise.c @@ -3,6 +3,7 @@ Frank Neumann, October 1993 *********************************************************************/ +#include "pm_c_util.h" #include "mallocvar.h" #include "shhopt.h" #include "pgm.h" diff --git a/generator/pgmramp.c b/generator/pgmramp.c index 30d224db..c0fb42b1 100644 --- a/generator/pgmramp.c +++ b/generator/pgmramp.c @@ -11,6 +11,8 @@ */ #include <math.h> + +#include "pm_c_util.h" #include "pgm.h" #include "shhopt.h" diff --git a/generator/ppmcolors.c b/generator/ppmcolors.c index 9112e1b8..ecae2285 100644 --- a/generator/ppmcolors.c +++ b/generator/ppmcolors.c @@ -9,6 +9,7 @@ ******************************************************************************/ +#include "pm_c_util.h" #include "ppm.h" #include "shhopt.h" #include "nstring.h" diff --git a/generator/ppmrough.c b/generator/ppmrough.c index 879bcb06..b21adedf 100644 --- a/generator/ppmrough.c +++ b/generator/ppmrough.c @@ -14,6 +14,7 @@ #include <math.h> #include <sys/time.h> +#include "pm_c_util.h" #include "shhopt.h" #include "ppm.h" diff --git a/lib/libpbm1.c b/lib/libpbm1.c index 5d0df7a1..fc20071c 100644 --- a/lib/libpbm1.c +++ b/lib/libpbm1.c @@ -18,6 +18,7 @@ #include <stdio.h> +#include "pm_c_util.h" #include "mallocvar.h" #include "shhopt.h" #include "pbm.h" diff --git a/lib/util/shhopt.h b/lib/util/shhopt.h index e5f05b90..99096a76 100644 --- a/lib/util/shhopt.h +++ b/lib/util/shhopt.h @@ -1,4 +1,4 @@ -/*============================================================================== +/*============================================================================= HERE IS AN EXAMPLE OF THE USE OF SHHOPT: @@ -232,14 +232,4 @@ optDestroyNameValueList(struct optNameValue * const list); } #endif -/* Here's a hack to help us introduce pm_c_util.h. That should be - #included in nearly every Netpbm program, but we're too lazy to insert - it into hundreds of files right now. But shhopt.h is included into - most of those files, so we #include it here! - - Before 2005.12.03, the stuff that is now in pm_c_util.h was in pm.h, - but that's a bad place for it because pm.h is an external header file. -*/ -#include "pm_c_util.h" - #endif diff --git a/other/pambayer.c b/other/pambayer.c index aa4beef1..b4eaae75 100644 --- a/other/pambayer.c +++ b/other/pambayer.c @@ -25,6 +25,7 @@ #include <unistd.h> #include <stdio.h> +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/other/pamchannel.c b/other/pamchannel.c index ac7bae65..64ab728b 100644 --- a/other/pamchannel.c +++ b/other/pamchannel.c @@ -13,6 +13,7 @@ #include <string.h> +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/other/pamfixtrunc.c b/other/pamfixtrunc.c index 7bf2435e..6d71406f 100644 --- a/other/pamfixtrunc.c +++ b/other/pamfixtrunc.c @@ -11,6 +11,7 @@ #include <setjmp.h> +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/other/pamlookup.c b/other/pamlookup.c index 2651d596..3b7a7f59 100644 --- a/other/pamlookup.c +++ b/other/pamlookup.c @@ -13,6 +13,7 @@ ============================================================================*/ +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" #include "pm_system.h" diff --git a/other/pampick.c b/other/pampick.c index 7c2d4385..c6b66fe1 100644 --- a/other/pampick.c +++ b/other/pampick.c @@ -12,6 +12,7 @@ #include <string.h> #include <stdio.h> +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" #include "nstring.h" diff --git a/other/pamsplit.c b/other/pamsplit.c index b9ff6247..a03353d7 100644 --- a/other/pamsplit.c +++ b/other/pamsplit.c @@ -14,6 +14,8 @@ #include <string.h> #include <stdio.h> + +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" #include "nstring.h" diff --git a/other/pamstack.c b/other/pamstack.c index d9691f74..d826cf1f 100644 --- a/other/pamstack.c +++ b/other/pamstack.c @@ -14,6 +14,7 @@ #include <string.h> +#include "pm_c_util.h" #include "mallocvar.h" #include "nstring.h" #include "shhopt.h" diff --git a/other/pamsummcol.c b/other/pamsummcol.c index c2c3e46b..c31a9940 100644 --- a/other/pamsummcol.c +++ b/other/pamsummcol.c @@ -10,6 +10,7 @@ ******************************************************************************/ +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/other/pamx/pamx.c b/other/pamx/pamx.c index de390098..130cc64c 100644 --- a/other/pamx/pamx.c +++ b/other/pamx/pamx.c @@ -9,6 +9,7 @@ #include <errno.h> #include <string.h> +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" #include "mallocvar.h" diff --git a/other/ppmsvgalib.c b/other/ppmsvgalib.c index f607d047..5bcabdc1 100644 --- a/other/ppmsvgalib.c +++ b/other/ppmsvgalib.c @@ -16,6 +16,8 @@ #include <errno.h> #include <signal.h> #include <unistd.h> + +#include "pm_c_util.h" #include "ppm.h" #include "shhopt.h" diff --git a/version.mk b/version.mk index d96e71e9..3f08e649 100644 --- a/version.mk +++ b/version.mk @@ -1,4 +1,4 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 46 -NETPBM_POINT_RELEASE = 00 +NETPBM_POINT_RELEASE = 99 |