about summary refs log tree commit diff
path: root/converter/other/fiasco
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2010-08-07 05:49:40 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2010-08-07 05:49:40 +0000
commit9233ab8147420f462bf2d22138b6a323a72c5099 (patch)
tree9f0e134ff809d7a9b04650234e9ba4802dd6a5b1 /converter/other/fiasco
parent5f7b1813961e6559564e305e83d5177aa6311d0b (diff)
downloadnetpbm-mirror-9233ab8147420f462bf2d22138b6a323a72c5099.tar.gz
netpbm-mirror-9233ab8147420f462bf2d22138b6a323a72c5099.tar.xz
netpbm-mirror-9233ab8147420f462bf2d22138b6a323a72c5099.zip
cleanup
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1273 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other/fiasco')
-rw-r--r--converter/other/fiasco/codec/control.c6
-rw-r--r--converter/other/fiasco/codec/decoder.c6
-rw-r--r--converter/other/fiasco/codec/domain-pool.c12
-rw-r--r--converter/other/fiasco/codec/motion.c6
-rw-r--r--converter/other/fiasco/codec/mwfa.c7
-rw-r--r--converter/other/fiasco/codec/options.c5
-rw-r--r--converter/other/fiasco/codec/prediction.c6
-rw-r--r--converter/other/fiasco/codec/subdivide.c6
-rw-r--r--converter/other/fiasco/codec/tiling.c4
-rw-r--r--converter/other/fiasco/codec/wfalib.c5
-rw-r--r--converter/other/fiasco/display.c12
-rw-r--r--converter/other/fiasco/lib/bit-io.c4
-rw-r--r--converter/other/fiasco/lib/dither.c10
-rw-r--r--converter/other/fiasco/lib/error.c15
-rw-r--r--converter/other/fiasco/lib/list.c6
-rw-r--r--converter/other/fiasco/lib/misc.c11
-rw-r--r--converter/other/fiasco/output/matrices.c4
-rw-r--r--converter/other/fiasco/pnmtofiasco.c13
18 files changed, 26 insertions, 112 deletions
diff --git a/converter/other/fiasco/codec/control.c b/converter/other/fiasco/codec/control.c
index 9af9928b..94c23c83 100644
--- a/converter/other/fiasco/codec/control.c
+++ b/converter/other/fiasco/codec/control.c
@@ -16,11 +16,7 @@
 
 #include "config.h"
 
-#if HAVE_STRING_H
-#	include <string.h>
-#else /* not HAVE_STRING_H */
-#	include <strings.h>
-#endif /* not HAVE_STRING_H */
+#include <string.h>
  
 #include "types.h"
 #include "macros.h"
diff --git a/converter/other/fiasco/codec/decoder.c b/converter/other/fiasco/codec/decoder.c
index ab06dd2e..253f23dc 100644
--- a/converter/other/fiasco/codec/decoder.c
+++ b/converter/other/fiasco/codec/decoder.c
@@ -18,11 +18,7 @@
 #include "pm_config.h"
 #include "config.h"
 
-#if HAVE_STRING_H
-#   include <string.h>
-#else /* not HAVE_STRING_H */
-#   include <strings.h>
-#endif /* not HAVE_STRING_H */
+#include <string.h>
 
 #include "types.h"
 #include "macros.h"
diff --git a/converter/other/fiasco/codec/domain-pool.c b/converter/other/fiasco/codec/domain-pool.c
index 09f854a6..d7c0602f 100644
--- a/converter/other/fiasco/codec/domain-pool.c
+++ b/converter/other/fiasco/codec/domain-pool.c
@@ -17,16 +17,8 @@
 #include "config.h"
 
 #include <math.h>
-
-#if STDC_HEADERS
-#   include <stdlib.h>
-#endif /* not STDC_HEADERS */
-
-#if HAVE_STRING_H
-#   include <string.h>
-#else /* not HAVE_STRING_H */
-#   include <strings.h>
-#endif /* not HAVE_STRING_H */
+#include <stdlib.h>
+#include <string.h>
 
 #include "types.h"
 #include "macros.h"
diff --git a/converter/other/fiasco/codec/motion.c b/converter/other/fiasco/codec/motion.c
index 92951281..1a1c78aa 100644
--- a/converter/other/fiasco/codec/motion.c
+++ b/converter/other/fiasco/codec/motion.c
@@ -17,11 +17,7 @@
 
 #include "config.h"
 
-#if HAVE_STRING_H
-#	include <string.h>
-#else /* not HAVE_STRING_H */
-#	include <strings.h>
-#endif /* not HAVE_STRING_H */
+#include <string.h>
 
 #include "types.h"
 #include "macros.h"
diff --git a/converter/other/fiasco/codec/mwfa.c b/converter/other/fiasco/codec/mwfa.c
index 6f0af8be..e0d7c99e 100644
--- a/converter/other/fiasco/codec/mwfa.c
+++ b/converter/other/fiasco/codec/mwfa.c
@@ -18,12 +18,7 @@
 #include "config.h"
 
 #include <ctype.h>
-
-#if HAVE_STRING_H
-#	include <string.h>
-#else /* not HAVE_STRING_H */
-#	include <strings.h>
-#endif /* not HAVE_STRING_H */
+#include <string.h>
 
 #include "types.h"
 #include "macros.h"
diff --git a/converter/other/fiasco/codec/options.c b/converter/other/fiasco/codec/options.c
index 6018a16c..c8e4d2e2 100644
--- a/converter/other/fiasco/codec/options.c
+++ b/converter/other/fiasco/codec/options.c
@@ -20,10 +20,7 @@
 #include "config.h"
 
 #include <string.h>
-#if STDC_HEADERS
-#	include <stdlib.h>
-#endif /* not STDC_HEADERS */
-
+#include <stdlib.h>
 #include <stdio.h>
 
 #include "nstring.h"
diff --git a/converter/other/fiasco/codec/prediction.c b/converter/other/fiasco/codec/prediction.c
index 351ba9df..e056d10f 100644
--- a/converter/other/fiasco/codec/prediction.c
+++ b/converter/other/fiasco/codec/prediction.c
@@ -17,11 +17,7 @@
 
 #include "config.h"
 
-#if HAVE_STRING_H
-#	include <string.h>
-#else /* not HAVE_STRING_H */
-#	include <strings.h>
-#endif /* not HAVE_STRING_H */
+#include <string.h>
 
 #include "types.h"
 #include "macros.h"
diff --git a/converter/other/fiasco/codec/subdivide.c b/converter/other/fiasco/codec/subdivide.c
index b7982716..f845d859 100644
--- a/converter/other/fiasco/codec/subdivide.c
+++ b/converter/other/fiasco/codec/subdivide.c
@@ -16,11 +16,7 @@
 
 #include "config.h"
 
-#if HAVE_STRING_H
-#	include <string.h>
-#else /* not HAVE_STRING_H */
-#	include <strings.h>
-#endif /* not HAVE_STRING_H */
+#include <string.h>
 
 #include "types.h"
 #include "macros.h"
diff --git a/converter/other/fiasco/codec/tiling.c b/converter/other/fiasco/codec/tiling.c
index e820f7fb..ea030c9a 100644
--- a/converter/other/fiasco/codec/tiling.c
+++ b/converter/other/fiasco/codec/tiling.c
@@ -16,9 +16,7 @@
 
 #include "config.h"
 
-#if STDC_HEADERS
-#	include <stdlib.h>
-#endif /* not STDC_HEADERS */
+#include <stdlib.h>
 
 #include "types.h"
 #include "macros.h"
diff --git a/converter/other/fiasco/codec/wfalib.c b/converter/other/fiasco/codec/wfalib.c
index a3acb975..bc7c35ef 100644
--- a/converter/other/fiasco/codec/wfalib.c
+++ b/converter/other/fiasco/codec/wfalib.c
@@ -19,10 +19,7 @@
 
 #include "config.h"
 
-#if STDC_HEADERS
-#	include <stdlib.h>
-#endif /* not STDC_HEADERS */
-
+#include <stdlib.h>
 #include <string.h>
 
 #include "types.h"
diff --git a/converter/other/fiasco/display.c b/converter/other/fiasco/display.c
index 9e531149..368fd3c9 100644
--- a/converter/other/fiasco/display.c
+++ b/converter/other/fiasco/display.c
@@ -27,16 +27,8 @@
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 
-#if STDC_HEADERS
-#	include <stdlib.h>
-#	include <string.h>
-#else /* not STDC_HEADERS */
-#	if HAVE_STRING_H
-#		include <string.h>
-#	else /* not HAVE_STRING_H */
-#		include <strings.h>
-#	endif /* not HAVE_STRING_H */
-#endif /* not STDC_HEADERS */
+#include <stdlib.h>
+#include <string.h>
 
 #include "types.h"
 #include "macros.h"
diff --git a/converter/other/fiasco/lib/bit-io.c b/converter/other/fiasco/lib/bit-io.c
index 04017c31..1bfef598 100644
--- a/converter/other/fiasco/lib/bit-io.c
+++ b/converter/other/fiasco/lib/bit-io.c
@@ -20,9 +20,7 @@
 #include "config.h"
 
 #include <string.h>
-#if STDC_HEADERS
-#   include <stdlib.h>
-#endif /* not STDC_HEADERS */
+#include <stdlib.h>
 
 #include "nstring.h"
 
diff --git a/converter/other/fiasco/lib/dither.c b/converter/other/fiasco/lib/dither.c
index a26e0541..accd9dd6 100644
--- a/converter/other/fiasco/lib/dither.c
+++ b/converter/other/fiasco/lib/dither.c
@@ -38,14 +38,8 @@
 #include "pm_config.h"
 #include "config.h"
 
-#if HAVE_STRING_H
-#	include <string.h>
-#else /* not HAVE_STRING_H */
-#	include <strings.h>
-#endif /* not HAVE_STRING_H */
-#if STDC_HEADERS
-#	include <stdlib.h>
-#endif /* not STDC_HEADERS */
+#include <string.h>
+#include <stdlib.h>
 
 #include "types.h"
 #include "macros.h"
diff --git a/converter/other/fiasco/lib/error.c b/converter/other/fiasco/lib/error.c
index b858badf..13cec99a 100644
--- a/converter/other/fiasco/lib/error.c
+++ b/converter/other/fiasco/lib/error.c
@@ -29,18 +29,9 @@
 #include <stdio.h>
 #include <errno.h>
 
-#if STDC_HEADERS
-#	include <stdarg.h>
-#	define VA_START(args, lastarg) va_start(args, lastarg)
-#else  /* not STDC_HEADERS */
-#	include <varargs.h>
-#	define VA_START(args, lastarg) va_start(args)
-#endif /* not STDC_HEADERS */
-#if HAVE_STRING_H
-#	include <string.h>
-#else /* not HAVE_STRING_H */
-#	include <strings.h>
-#endif /* not HAVE_STRING_H */
+#include <stdarg.h>
+#define VA_START(args, lastarg) va_start(args, lastarg)
+#include <string.h>
 
 #if HAVE_SETJMP_H
 #	include <setjmp.h>
diff --git a/converter/other/fiasco/lib/list.c b/converter/other/fiasco/lib/list.c
index 9f516c2e..bb4efae1 100644
--- a/converter/other/fiasco/lib/list.c
+++ b/converter/other/fiasco/lib/list.c
@@ -16,11 +16,7 @@
 
 #include "config.h"
 
-#if HAVE_STRING_H
-#	include <string.h>
-#else /* not HAVE_STRING_H */
-#	include <strings.h>
-#endif /* not HAVE_STRING_H */
+#include <string.h>
 
 #include "types.h"
 #include "macros.h"
diff --git a/converter/other/fiasco/lib/misc.c b/converter/other/fiasco/lib/misc.c
index 12b94e7a..e0e41447 100644
--- a/converter/other/fiasco/lib/misc.c
+++ b/converter/other/fiasco/lib/misc.c
@@ -33,15 +33,8 @@
 #	endif /* not HAVE_SYS_TIME_H */
 #endif /* not TIME_WITH_SYS_TIME */
 
-#if STDC_HEADERS
-#	include <stdlib.h>
-#endif /* not STDC_HEADERS */
-
-#if HAVE_STRING_H
-#	include <string.h>
-#else /* not HAVE_STRING_H */
-#	include <strings.h>
-#endif /* not HAVE_STRING_H */
+#include <stdlib.h>
+#include <string.h>
 
 #include "types.h"
 #include "macros.h"
diff --git a/converter/other/fiasco/output/matrices.c b/converter/other/fiasco/output/matrices.c
index fd8d31e2..bbe3ca0e 100644
--- a/converter/other/fiasco/output/matrices.c
+++ b/converter/other/fiasco/output/matrices.c
@@ -20,9 +20,7 @@
 
 #include "config.h"
 
-#if STDC_HEADERS
-#	include <stdlib.h>
-#endif /* not STDC_HEADERS */
+#include <stdlib.h>
 
 #include "types.h"
 #include "macros.h"
diff --git a/converter/other/fiasco/pnmtofiasco.c b/converter/other/fiasco/pnmtofiasco.c
index 07b97d7e..f62d876e 100644
--- a/converter/other/fiasco/pnmtofiasco.c
+++ b/converter/other/fiasco/pnmtofiasco.c
@@ -17,16 +17,9 @@
 #include "config.h"
 #include "pnm.h"
 
-#if STDC_HEADERS
-#   include <stdlib.h>
-#   include <string.h>
-#else /* not STDC_HEADERS */
-#   if HAVE_STRING_H
-#       include <string.h>
-#   else /* not HAVE_STRING_H */
-#       include <strings.h>
-#   endif /* not HAVE_STRING_H */
-#endif /* not STDC_HEADERS */
+#include <stdlib.h>
+#include <string.h>
+#include <string.h>
 
 #include "types.h"
 #include "macros.h"
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-06-30 22:00:57 +0000