summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2002-11-21 09:24:43 +0000
committerJim Meyering <jim@meyering.net>2002-11-21 09:24:43 +0000
commit3aed4c550503a0565591a723580081f5111c0f6c (patch)
treeaf5f6f8426298f38ff77eebba6bd475d1bbc0472 /lib
parent501358c1069eff16b400477dec123c87b0964de2 (diff)
downloadcoreutils-3aed4c550503a0565591a723580081f5111c0f6c.tar.xz
Merge argmatch cleanups from Bison. Assume C89.
Include config.h here, not in argmatch.h. Include stdlib.h, for EXIT_FAILURE. Always include <string.h>, since we assume C89. (EXIT_FAILURE): Remove pre-C89 bug workaround.
Diffstat (limited to 'lib')
-rw-r--r--lib/argmatch.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/lib/argmatch.c b/lib/argmatch.c
index 005be881f..746365840 100644
--- a/lib/argmatch.c
+++ b/lib/argmatch.c
@@ -18,12 +18,15 @@
/* Written by David MacKenzie <djm@ai.mit.edu>
Modified by Akim Demaille <demaille@inf.enst.fr> */
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "argmatch.h"
#include <stdio.h>
-#ifdef STDC_HEADERS
-# include <string.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
#if HAVE_LOCALE_H
# include <locale.h>
@@ -48,14 +51,6 @@
# define ARGMATCH_QUOTING_STYLE locale_quoting_style
#endif
-/* The following test is to work around the gross typo in
- systems like Sony NEWS-OS Release 4.0C, whereby EXIT_FAILURE
- is defined to 0, not 1. */
-#if !EXIT_FAILURE
-# undef EXIT_FAILURE
-# define EXIT_FAILURE 1
-#endif
-
/* Non failing version of argmatch call this function after failing. */
#ifndef ARGMATCH_DIE
# define ARGMATCH_DIE exit (EXIT_FAILURE)