summaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
Diffstat (limited to 'libc')
-rw-r--r--libc/sysdeps/linux/common/bits/getopt.h2
-rw-r--r--libc/unistd/getopt.c7
2 files changed, 3 insertions, 6 deletions
diff --git a/libc/sysdeps/linux/common/bits/getopt.h b/libc/sysdeps/linux/common/bits/getopt.h
index 89bd33238..7edb7bb44 100644
--- a/libc/sysdeps/linux/common/bits/getopt.h
+++ b/libc/sysdeps/linux/common/bits/getopt.h
@@ -33,7 +33,7 @@
not defined, include <ctype.h>, which will pull in <features.h> for us
if it's from glibc. (Why ctype.h? It's guaranteed to exist and it
doesn't flood the namespace with stuff the way some other headers do.) */
-#if !defined __GNU_LIBRARY__
+#if !defined __GNU_LIBRARY__ && !defined __UCLIBC__
# include <ctype.h>
#endif
diff --git a/libc/unistd/getopt.c b/libc/unistd/getopt.c
index f4c113092..f1ee0f462 100644
--- a/libc/unistd/getopt.c
+++ b/libc/unistd/getopt.c
@@ -36,9 +36,6 @@
# include <config.h>
#endif
-#define __FORCE_GLIBC
-#include <features.h>
-
#include <stdio.h>
/* Comment out all this code if we are using the GNU C Library, and are not
@@ -62,7 +59,7 @@
/* This needs to come after some library #include
to get __GNU_LIBRARY__ defined. */
-#ifdef __GNU_LIBRARY__
+#if defined __GNU_LIBRARY__ || defined __UCLIBC__
/* Don't include stdlib.h for non-GNU C libraries because some of them
contain conflicting prototypes for getopt. */
# include <stdlib.h>
@@ -161,7 +158,7 @@ int optopt = '?';
static struct _getopt_data getopt_data;
-#ifndef __GNU_LIBRARY__
+#if !defined __GNU_LIBRARY__ && !defined __UCLIBC__
/* Avoid depending on library functions or files
whose names are inconsistent. */