diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2014-12-25 22:48:20 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2014-12-25 22:48:20 +0100 |
| commit | da932d59161a2d833596be5443c81ff244d2db58 (patch) | |
| tree | f0be076d5698256344227fb8c63f5da29ff57939 /extra/config | |
| parent | 88842f7126daccf205204be05d3143c73fa0624d (diff) | |
| parent | 638a23483b40c5b606ee323e6612e7e454e5154b (diff) | |
merge upstream changes
Diffstat (limited to 'extra/config')
| -rw-r--r-- | extra/config/conf.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/extra/config/conf.c b/extra/config/conf.c index db0905319..b24c1c355 100644 --- a/extra/config/conf.c +++ b/extra/config/conf.c @@ -10,7 +10,6 @@ #include <string.h> #include <time.h> #include <unistd.h> -#include <getopt.h> #include <sys/stat.h> #include <sys/time.h> #include <errno.h> @@ -447,7 +446,7 @@ static void check_conf(struct menu *menu) } #if 00 // || !defined __UCLIBC__ || \ - (defined UCLIBC_HAS_GETOPT_LONG || defined UCLIBC_HAS_GNU_GETOPT) + defined __UCLIBC_HAS_GETOPT_LONG__ static struct option long_opts[] = { {"oldaskconfig", no_argument, NULL, oldaskconfig}, {"oldconfig", no_argument, NULL, oldconfig}, @@ -526,7 +525,7 @@ int main(int ac, char **av) tty_stdio = isatty(0) && isatty(1) && isatty(2); #if 00// !defined __UCLIBC__ || \ - (defined UCLIBC_HAS_GETOPT_LONG || defined UCLIBC_HAS_GNU_GETOPT) + defined __UCLIBC_HAS_GETOPT_LONG__ while ((opt = getopt_long(ac, av, "", long_opts, NULL)) != -1) #else char *gch = "asonymArDSld"; |