From 81f2dc000d38c6da5b3a1cf690cda83b2972c7db Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sat, 11 Feb 2012 19:35:57 +0100 Subject: [PATCH] Config: CONFIG_OWN_GETOPT moved to UCW namespace --- ucw/Makefile | 2 +- ucw/default.cfg | 2 +- ucw/getopt.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ucw/Makefile b/ucw/Makefile index 54fce8d1..97144a0a 100644 --- a/ucw/Makefile +++ b/ucw/Makefile @@ -70,7 +70,7 @@ ifdef CONFIG_UCW_FB_DIRECT LIBUCW_MODS+=fb-direct endif -ifdef CONFIG_OWN_GETOPT +ifdef CONFIG_UCW_OWN_GETOPT include $(s)/ucw/getopt/Makefile endif diff --git a/ucw/default.cfg b/ucw/default.cfg index 46c6fa40..625c4cbd 100644 --- a/ucw/default.cfg +++ b/ucw/default.cfg @@ -23,7 +23,7 @@ UnSet("CONFIG_STATIC_PIC"); # If your system can't reset getopt with 'optind = 0', you need to compile our internal copy # of GNU libc's getopt. This should not be necessary on GNU libc. -UnSet("CONFIG_OWN_GETOPT"); +UnSet("CONFIG_UCW_OWN_GETOPT"); # Install libraries and their API includes UnSet("CONFIG_INSTALL_API"); diff --git a/ucw/getopt.h b/ucw/getopt.h index eb350012..a192c0f7 100644 --- a/ucw/getopt.h +++ b/ucw/getopt.h @@ -11,7 +11,7 @@ #ifndef _UCW_GETOPT_H #define _UCW_GETOPT_H -#ifdef CONFIG_OWN_GETOPT +#ifdef CONFIG_UCW_OWN_GETOPT #include "ucw/getopt/getopt-sh.h" #else #include -- 2.39.5