aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-10-02 18:08:13 -0700
committerH. Peter Anvin <hpa@zytor.com>2010-10-02 18:08:13 -0700
commitd8ca5a474532f44d9a76568ee6edc4070e062fe4 (patch)
treeac526eec4f18de0727e622069a773a169da5c57d
parent2c3bf5cfcb462a3b780ea61330feecf9be08263d (diff)
downloadabc80-d8ca5a474532f44d9a76568ee6edc4070e062fe4.tar.gz
abc80-d8ca5a474532f44d9a76568ee6edc4070e062fe4.tar.xz
abc80-d8ca5a474532f44d9a76568ee6edc4070e062fe4.zip
z80asm: fix some annoying compile problems
Fix some unnecessary breakage of prototypes.
-rw-r--r--tools/z80asm/gnulib/getopt.c12
-rw-r--r--tools/z80asm/gnulib/getopt.h4
2 files changed, 1 insertions, 15 deletions
diff --git a/tools/z80asm/gnulib/getopt.c b/tools/z80asm/gnulib/getopt.c
index 6dcdbeb..1347f14 100644
--- a/tools/z80asm/gnulib/getopt.c
+++ b/tools/z80asm/gnulib/getopt.c
@@ -34,6 +34,7 @@
#endif
#include <stdio.h>
+#include <stdlib.h>
/* Comment out all this code if we are using the GNU C Library, and are not
actually compiling the library itself. This code is part of the GNU C
@@ -187,17 +188,6 @@ static enum
/* Value of POSIXLY_CORRECT environment variable. */
static char *posixly_correct;
-#ifndef __GNU_LIBRARY__
-
-/* Avoid depending on library functions or files
- whose names are inconsistent. */
-
-#ifndef getenv
-extern char *getenv ();
-#endif
-
-#endif /* not __GNU_LIBRARY__ */
-
/* Handle permutation of arguments. */
/* Describe the part of ARGV that contains non-options that have
diff --git a/tools/z80asm/gnulib/getopt.h b/tools/z80asm/gnulib/getopt.h
index 1a55bab..d75535b 100644
--- a/tools/z80asm/gnulib/getopt.h
+++ b/tools/z80asm/gnulib/getopt.h
@@ -135,14 +135,10 @@ struct option
arguments to the option '\0'. This behavior is specific to the GNU
`getopt'. */
-#ifdef __GNU_LIBRARY__
/* Many other libraries have conflicting prototypes for getopt, with
differences in the consts, in stdlib.h. To avoid compilation
errors, only prototype getopt for the GNU C library. */
extern int getopt (int ___argc, char *const *___argv, const char *__shortopts);
-#else /* not __GNU_LIBRARY__ */
-extern int getopt ();
-#endif /* __GNU_LIBRARY__ */
#ifndef __need_getopt
extern int getopt_long (int ___argc, char *const *___argv,