Clean up a number of obsolete autoconf-detected standard C things.

svn path=/trunk/yasm/; revision=1892

diff --git a/Mkfiles/dj/config.h b/Mkfiles/dj/config.h
index 759ced57e86c84011df1d73fbb54945363717f8b..1c8342639b8a6689499f6fb77d4fcf397ce6d990 100644 (file)
--- a/Mkfiles/dj/config.h
+++ b/Mkfiles/dj/config.h
@@ -13,12 +13,20 @@
 /* */\r
 /* #undef HAVE_CATGETS */\r
 \r
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the\r
+   CoreFoundation framework. */\r
+/* #undef HAVE_CFLOCALECOPYCURRENT */\r
+\r
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in\r
+   the CoreFoundation framework. */\r
+/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */\r
+\r
 /* Define if the GNU dcgettext() function is already present or preinstalled.\r
    */\r
 /* #undef HAVE_DCGETTEXT */\r
 \r
-/* Define if you don't have `vprintf' but do have `_doprnt'. */\r
-/* #undef HAVE_DOPRNT */\r
+/* Define to 1 if you have the <direct.h> header file. */\r
+/* #undef HAVE_DIRECT_H */\r
 \r
 /* Define to 1 if you have the `getcwd' function. */\r
 #define HAVE_GETCWD 1\r
@@ -41,15 +49,6 @@
 /* Define to 1 if you have the <libgen.h> header file. */\r
 /* #undef HAVE_LIBGEN_H */\r
 \r
-/* Define if you have the <limits.h> header file. */\r
-#define HAVE_LIMITS_H 1\r
-\r
-/* Define if you have the `memcpy' function. */\r
-#define HAVE_MEMCPY 1\r
-\r
-/* Define if you have the `memmove' function. */\r
-#define HAVE_MEMMOVE 1\r
-\r
 /* Define if you have the <memory.h> header file. */\r
 #define HAVE_MEMORY_H 1\r
 \r
@@ -83,36 +82,27 @@
 /* Define if you have the `strncasecmp' function. */\r
 #define HAVE_STRNCASECMP 1\r
 \r
-/* Define if you have the `strrchr' function. */\r
-#define HAVE_STRRCHR 1\r
-\r
 /* Define if you have the `strsep' function. */\r
 #define HAVE_STRSEP 1\r
 \r
-/* Define if you have the <sys/param.h> header file. */\r
-#define HAVE_SYS_PARAM_H 1\r
-\r
 /* Define if you have the <sys/stat.h> header file. */\r
 #define HAVE_SYS_STAT_H 1\r
 \r
 /* Define if you have the <sys/types.h> header file. */\r
 #define HAVE_SYS_TYPES_H 1\r
 \r
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */\r
-#define HAVE_SYS_WAIT_H 1\r
-\r
 /* Define if you have the `toascii' function. */\r
 #define HAVE_TOASCII 1\r
 \r
 /* Define if you have the <unistd.h> header file. */\r
 #define HAVE_UNISTD_H 1\r
 \r
-/* Define if you have the vprintf function. */\r
-#define HAVE_VPRINTF 1\r
-\r
 /* Define to 1 if you have the `vsnprintf' function. */\r
 /* #undef HAVE_VSNPRINTF */\r
 \r
+/* Define to 1 if you have the `_stricmp' function. */\r
+/* #undef HAVE__STRICMP */\r
+\r
 /* Name of package */\r
 #define PACKAGE "yasm"\r
 \r

diff --git a/Mkfiles/vc/config.h b/Mkfiles/vc/config.h
index 942f3224f558a614b2c6b0d0f418c9ee59493ddb..d217c5442b59d2b73ab710de7e7442717e4455a2 100644 (file)
--- a/Mkfiles/vc/config.h
+++ b/Mkfiles/vc/config.h
@@ -13,12 +13,20 @@
 /* */\r
 /* #undef HAVE_CATGETS */\r
 \r
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the\r
+   CoreFoundation framework. */\r
+/* #undef HAVE_CFLOCALECOPYCURRENT */\r
+\r
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in\r
+   the CoreFoundation framework. */\r
+/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */\r
+\r
 /* Define if the GNU dcgettext() function is already present or preinstalled.\r
    */\r
 /* #undef HAVE_DCGETTEXT */\r
 \r
-/* Define if you don't have `vprintf' but do have `_doprnt'. */\r
-/* #undef HAVE_DOPRNT */\r
+/* Define to 1 if you have the <direct.h> header file. */\r
+#define HAVE_DIRECT_H 1\r
 \r
 /* Define to 1 if you have the `getcwd' function. */\r
 #define HAVE_GETCWD 1\r
@@ -41,15 +49,6 @@
 /* Define to 1 if you have the <libgen.h> header file. */\r
 /* #undef HAVE_LIBGEN_H */\r
 \r
-/* Define if you have the <limits.h> header file. */\r
-#define HAVE_LIMITS_H 1\r
-\r
-/* Define if you have the `memcpy' function. */\r
-#define HAVE_MEMCPY 1\r
-\r
-/* Define if you have the `memmove' function. */\r
-#define HAVE_MEMMOVE 1\r
-\r
 /* Define if you have the <memory.h> header file. */\r
 /* #undef HAVE_MEMORY_H */\r
 \r
@@ -72,7 +71,7 @@
 /* #undefine HAVE_STRCMPI */\r
 \r
 /* Define if you have the `stricmp' function. */\r
-#define HAVE__STRICMP 1\r
+/* #undefine HAVE_STRICMP */\r
 \r
 /* Define if you have the <strings.h> header file. */\r
 /* #undef HAVE_STRINGS_H */\r
@@ -83,24 +82,15 @@
 /* Define if you have the `strncasecmp' function. */\r
 /* #undef HAVE_STRNCASECMP */\r
 \r
-/* Define if you have the `strrchr' function. */\r
-/* #undef HAVE_STRRCHR */\r
-\r
 /* Define if you have the `strsep' function. */\r
 /* #undef HAVE_STRSEP */\r
 \r
-/* Define if you have the <sys/param.h> header file. */\r
-/* #undef HAVE_SYS_PARAM_H */\r
-\r
 /* Define if you have the <sys/stat.h> header file. */\r
 /* #undef HAVE_SYS_STAT_H */\r
 \r
 /* Define if you have the <sys/types.h> header file. */\r
 #define HAVE_SYS_TYPES_H 1\r
 \r
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */\r
-/* #undef HAVE_SYS_WAIT_H */\r
-\r
 /* Define if you have the `toascii' function. */\r
 #define HAVE_TOASCII 1\r
 #define toascii __toascii\r
@@ -108,12 +98,12 @@
 /* Define if you have the <unistd.h> header file. */\r
 /* #undef HAVE_UNISTD_H */\r
 \r
-/* Define if you have the vprintf function. */\r
-#define HAVE_VPRINTF 1\r
-\r
 /* Define to 1 if you have the `vsnprintf' function. */\r
 /* #undef HAVE_VSNPRINTF */\r
 \r
+/* Define to 1 if you have the `_stricmp' function. */\r
+#undef HAVE__STRICMP 1\r
+\r
 /* Name of package */\r
 #define PACKAGE "yasm"\r
 \r

diff --git a/Mkfiles/vc8/config.h b/Mkfiles/vc8/config.h
index 91168c611b274569d8976e302ceac51ec220db0b..62f2e7ce2a5fd68c6367ec557f00b03fca46c839 100644 (file)
--- a/Mkfiles/vc8/config.h
+++ b/Mkfiles/vc8/config.h
@@ -13,12 +13,20 @@
 /* */\r
 /* #undef HAVE_CATGETS */\r
 \r
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the\r
+   CoreFoundation framework. */\r
+/* #undef HAVE_CFLOCALECOPYCURRENT */\r
+\r
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in\r
+   the CoreFoundation framework. */\r
+/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */\r
+\r
 /* Define if the GNU dcgettext() function is already present or preinstalled.\r
    */\r
 /* #undef HAVE_DCGETTEXT */\r
 \r
-/* Define if you don't have `vprintf' but do have `_doprnt'. */\r
-/* #undef HAVE_DOPRNT */\r
+/* Define to 1 if you have the <direct.h> header file. */\r
+#define HAVE_DIRECT_H 1\r
 \r
 /* Define to 1 if you have the `getcwd' function. */\r
 #define HAVE_GETCWD 1\r
@@ -41,15 +49,6 @@
 /* Define to 1 if you have the <libgen.h> header file. */\r
 /* #undef HAVE_LIBGEN_H */\r
 \r
-/* Define if you have the <limits.h> header file. */\r
-#define HAVE_LIMITS_H 1\r
-\r
-/* Define if you have the `memcpy' function. */\r
-#define HAVE_MEMCPY 1\r
-\r
-/* Define if you have the `memmove' function. */\r
-#define HAVE_MEMMOVE 1\r
-\r
 /* Define if you have the <memory.h> header file. */\r
 /* #undef HAVE_MEMORY_H */\r
 \r
@@ -72,7 +71,7 @@
 /* #undef HAVE_STRCMPI */\r
 \r
 /* Define if you have the `stricmp' function. */\r
-#define HAVE__STRICMP 1\r
+/* #undefine HAVE_STRICMP */\r
 \r
 /* Define if you have the <strings.h> header file. */\r
 /* #undef HAVE_STRINGS_H */\r
@@ -83,24 +82,15 @@
 /* Define if you have the `strncasecmp' function. */\r
 /* #undef HAVE_STRNCASECMP */\r
 \r
-/* Define if you have the `strrchr' function. */\r
-/* #undef HAVE_STRRCHR */\r
-\r
 /* Define if you have the `strsep' function. */\r
 /* #undef HAVE_STRSEP */\r
 \r
-/* Define if you have the <sys/param.h> header file. */\r
-/* #undef HAVE_SYS_PARAM_H */\r
-\r
 /* Define if you have the <sys/stat.h> header file. */\r
 /* #undef HAVE_SYS_STAT_H */\r
 \r
 /* Define if you have the <sys/types.h> header file. */\r
 #define HAVE_SYS_TYPES_H 1\r
 \r
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */\r
-/* #undef HAVE_SYS_WAIT_H */\r
-\r
 /* Define if you have the `toascii' function. */\r
 #define HAVE_TOASCII 1\r
 #define toascii __toascii\r
@@ -108,12 +98,12 @@
 /* Define if you have the <unistd.h> header file. */\r
 /* #undef HAVE_UNISTD_H */\r
 \r
-/* Define if you have the vprintf function. */\r
-#define HAVE_VPRINTF 1\r
-\r
 /* Define to 1 if you have the `vsnprintf' function. */\r
 /* #undef HAVE_VSNPRINTF */\r
 \r
+/* Define to 1 if you have the `_stricmp' function. */\r
+#undef HAVE__STRICMP 1\r
+\r
 /* Name of package */\r
 #define PACKAGE "yasm"\r
 \r

diff --git a/configure.ac b/configure.ac
index 7e44b42b4429c4a103f5a4392307a4466122d4a4..5aef29b8eb3c5adc4bb0eb0eb40eff1d162aeb29 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -94,8 +94,7 @@ AM_WITH_DMALLOC
 # Checks for header files.
 #
 AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([limits.h sys/param.h libgen.h unistd.h])
+AC_CHECK_HEADERS([strings.h libgen.h unistd.h direct.h])
 
 # REQUIRE standard C headers
 if test "$ac_cv_header_stdc" != yes; then
@@ -114,11 +113,10 @@ AX_CREATE_STDINT_H([libyasm-stdint.h])
 #
 # Checks for library functions.
 #
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([abort memcpy memmove strrchr toascii vsnprintf])
+AC_CHECK_FUNCS([abort toascii vsnprintf])
 AC_CHECK_FUNCS([strsep mergesort getcwd])
 # Look for the case-insensitive comparison functions
-AC_CHECK_FUNCS([strcasecmp strncasecmp stricmp strcmpi])
+AC_CHECK_FUNCS([strcasecmp strncasecmp stricmp _stricmp strcmpi])
 
 #
 # Check for gettext() and other i18n/l10n things.
@@ -133,7 +131,7 @@ AH_TEMPLATE([HAVE_LC_MESSAGES], [])
 AH_TEMPLATE([HAVE_STPCPY], [])
 
 # Check for GNU C Library
-AH_TEMPLATE([HAVE_GNU_C_LIBRARY], [Define if you have the GNU C Library])
+AH_TEMPLATE([HAVE_GNU_C_LIBRARY], [Define to 1 if you have the GNU C Library])
 AC_CACHE_CHECK([for GNU C Library], yasm_cv_header_gnulib,
        AC_EGREP_CPP(gnulib,
        [#include <features.h>

diff --git a/libyasm/bitvect.c b/libyasm/bitvect.c
index dad4826b88eac59f56eea91c9c775b103e09bf22..3fbe0b953e68179d65d6003b71292181a278d589 100644 (file)
--- a/libyasm/bitvect.c
+++ b/libyasm/bitvect.c
@@ -10,10 +10,8 @@ RCSID("$Id$");
 /*  MODULE IMPORTS:                                                          */
 /*****************************************************************************/
 #include <ctype.h>                                  /*  MODULE TYPE:  (sys)  */
-#ifdef STDC_HEADERS
 #include <limits.h>                                 /*  MODULE TYPE:  (sys)  */
 #include <string.h>                                 /*  MODULE TYPE:  (sys)  */
-#endif
 /*****************************************************************************/
 /*  MODULE INTERFACE:                                                        */
 /*****************************************************************************/

diff --git a/libyasm/errwarn.c b/libyasm/errwarn.c
index 626ecbeee332c72d07e09b1cc6c52cc41b386296..b3a59c0563822c23a8b7b9f600c20b226994c8e6 100644 (file)
--- a/libyasm/errwarn.c
+++ b/libyasm/errwarn.c
@@ -29,10 +29,7 @@
 /*@unused@*/ RCSID("$Id$");
 
 #include <ctype.h>
-
-#ifdef STDC_HEADERS
-# include <stdarg.h>
-#endif
+#include <stdarg.h>
 
 #include "coretype.h"
 

diff --git a/libyasm/file.c b/libyasm/file.c
index 2ee3ee6f3c8c80b1f8094d743f9d98bffe651e22..cd2e002f6b48f9a4be0bc869de34b45990423873 100644 (file)
--- a/libyasm/file.c
+++ b/libyasm/file.c
@@ -28,9 +28,9 @@
 /*@unused@*/ RCSID("$Id$");
 
 /* Need either unistd.h or direct.h (on Windows) to prototype getcwd() */
-#ifdef HAVE_UNISTD_H
+#if defined(HAVE_UNISTD_H)
 #include <unistd.h>
-#elif defined(WIN32) || defined(_WIN32)
+#elif defined(HAVE_DIRECT_H)
 #include <direct.h>
 #endif
 

diff --git a/libyasm/mergesort.c b/libyasm/mergesort.c
index 82fe52a0ac34ac2f6a78b67cd6e675ce715c08f7..bde5242ea3ae83eeb83724994b770d8bbe98bd13 100644 (file)
--- a/libyasm/mergesort.c
+++ b/libyasm/mergesort.c
@@ -58,10 +58,8 @@ static char sccsid[] = "@(#)merge.c     8.2 (Berkeley) 2/14/94";
  * (The default is pairwise merging.)
  */
 
-#ifdef STDC_HEADERS
-# include <errno.h>
-# include <string.h>
-#endif
+#include <errno.h>
+#include <string.h>
 
 static void setup(unsigned char *, unsigned char *, size_t, size_t,
                   int (*)(const void *, const void *));

diff --git a/libyasm/symrec.c b/libyasm/symrec.c
index bef0eaa931f9046d884b094e3519c8d4279c198e..a28de47578b1b34ac6e03305335cbaa82fe5b8c0 100644 (file)
--- a/libyasm/symrec.c
+++ b/libyasm/symrec.c
@@ -28,9 +28,7 @@
 #include "util.h"
 /*@unused@*/ RCSID("$Id$");
 
-#ifdef STDC_HEADERS
-# include <limits.h>
-#endif
+#include <limits.h>
 
 #include "libyasm-stdint.h"
 #include "coretype.h"

diff --git a/libyasm/tests/bitvect_test.c b/libyasm/tests/bitvect_test.c
index 404852621c37345314d3eb154e6f5f638541a707..ea8f561e5c55d5e4d92d6d6ce3506e1074a40b2e 100644 (file)
--- a/libyasm/tests/bitvect_test.c
+++ b/libyasm/tests/bitvect_test.c
@@ -23,16 +23,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#endif
-
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "libyasm/bitvect.h"
 

diff --git a/libyasm/tests/combpath_test.c b/libyasm/tests/combpath_test.c
index e0edf8eba1c11c7690f8bce4e5925468f999efe9..35a5b4544a12075b17e77364323c058ace650139 100644 (file)
--- a/libyasm/tests/combpath_test.c
+++ b/libyasm/tests/combpath_test.c
@@ -23,16 +23,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#endif
-
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "libyasm/file.h"
 #include "libyasm/coretype.h"

diff --git a/libyasm/tests/floatnum_test.c b/libyasm/tests/floatnum_test.c
index 907aac9859f3e4ce020066d1dbbff3e4aff4844a..b0526ea5e10ac530069440c96fc99b635bf4a83b 100644 (file)
--- a/libyasm/tests/floatnum_test.c
+++ b/libyasm/tests/floatnum_test.c
@@ -23,16 +23,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#endif
-
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "libyasm/floatnum.c"
 

diff --git a/libyasm/tests/leb128_test.c b/libyasm/tests/leb128_test.c
index 18ae9958d8020ae0fb52a59f8a8559d1064fd3e8..aca537b493e2969b05c3c4bae1de7610d4520dc7 100644 (file)
--- a/libyasm/tests/leb128_test.c
+++ b/libyasm/tests/leb128_test.c
@@ -23,16 +23,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#endif
-
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "libyasm/intnum.c"
 

diff --git a/libyasm/tests/splitpath_test.c b/libyasm/tests/splitpath_test.c
index aada6a5d3a424650d99ce3170c3ac6e69a3af3d4..74792636768358a7c351e775e7a0a0cd04c77809 100644 (file)
--- a/libyasm/tests/splitpath_test.c
+++ b/libyasm/tests/splitpath_test.c
@@ -23,16 +23,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#endif
-
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "libyasm/file.h"
 

diff --git a/libyasm/tests/uncstring_test.c b/libyasm/tests/uncstring_test.c
index a067858e823e4dc81bb9e3e80e976815d3551e17..819c06f574221ae4a89768117ae7547245a840ac 100644 (file)
--- a/libyasm/tests/uncstring_test.c
+++ b/libyasm/tests/uncstring_test.c
@@ -23,16 +23,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#endif
-
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "util.h"
 #include "libyasm/errwarn.h"

diff --git a/modules/dbgfmts/dwarf2/dwarf2-info.c b/modules/dbgfmts/dwarf2/dwarf2-info.c
index f6d2643ead6d03bf72e4a29eafc6c5b739ca4027..433b93ef5b6e8d169cd205ac783245b1d2c3e9cd 100644 (file)
--- a/modules/dbgfmts/dwarf2/dwarf2-info.c
+++ b/modules/dbgfmts/dwarf2/dwarf2-info.c
@@ -28,9 +28,9 @@
 /*@unused@*/ RCSID("$Id$");
 
 /* Need either unistd.h or direct.h (on Windows) to prototype getcwd() */
-#ifdef HAVE_UNISTD_H
+#if defined(HAVE_UNISTD_H)
 #include <unistd.h>
-#elif defined(WIN32) || defined(_WIN32)
+#elif defined(HAVE_DIRECT_H)
 #include <direct.h>
 #endif
 

diff --git a/modules/parsers/nasm/nasm-parse.c b/modules/parsers/nasm/nasm-parse.c
index d710a61a520fc84fad25a7ce1180a9ff0372ca09..2943cf9c3bddb83752f3fe1096044124d0c69d3a 100644 (file)
--- a/modules/parsers/nasm/nasm-parse.c
+++ b/modules/parsers/nasm/nasm-parse.c
@@ -31,9 +31,7 @@ RCSID("$Id$");
 #define YASM_EXPR_INTERNAL
 #include <libyasm.h>
 
-#ifdef STDC_HEADERS
-# include <math.h>
-#endif
+#include <math.h>
 
 #include "modules/parsers/nasm/nasm-parser.h"
 

diff --git a/util.h b/util.h
index 189378129afdff9527a362dc15e499ca8367ced2..f19792e8240cd6ef8757a5c38c4766357884798f 100644 (file)
--- a/util.h
+++ b/util.h
@@ -60,6 +60,10 @@
 #include <string.h>
 #include <assert.h>
 
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
 #include <libyasm/coretype.h>
 
 #ifdef lint