diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-04 20:22:39 +0300 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-04 20:22:39 +0300 |
| commit | 463d86a9bf0e50bdff59e2581d480fc69ce8e6cc (patch) | |
| tree | ffba2c073817acae08387ac03082c89de8ab9ff8 | |
| parent | ec4e385ca5813b889321ac60a51de8f9482513e1 (diff) | |
| download | mariadb-git-463d86a9bf0e50bdff59e2581d480fc69ce8e6cc.tar.gz | |
Changed __USE_XOPEN to _XOPEN_SOURCE and got rid of
some extra code.
| -rw-r--r-- | cmd-line-utils/readline/complete.c | 11 | ||||
| -rw-r--r-- | cmd-line-utils/readline/display.c | 11 | ||||
| -rw-r--r-- | cmd-line-utils/readline/mbutil.c | 11 |
3 files changed, 12 insertions, 21 deletions
diff --git a/cmd-line-utils/readline/complete.c b/cmd-line-utils/readline/complete.c index 393700b51e8..41ea22d815e 100644 --- a/cmd-line-utils/readline/complete.c +++ b/cmd-line-utils/readline/complete.c @@ -21,14 +21,15 @@ 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ #define READLINE_LIBRARY +#ifndef _XOPEN_SOURCE +#define _XOPEN_SOURCE 500 +#endif + #include "config_readline.h" #include <sys/types.h> /* To get SuSE 9.3 to define wcwidth() (in wchar.h) */ -#ifndef __USE_XOPEN -#define __USE_XOPEN -#endif #include <fcntl.h> @@ -62,10 +63,6 @@ extern int errno; #include "rldefs.h" #include "rlmbutil.h" -#ifdef HAVE_WCHAR_H -#include <wchar.h> -#endif - /* Some standard library routines. */ #include "readline.h" #include "xmalloc.h" diff --git a/cmd-line-utils/readline/display.c b/cmd-line-utils/readline/display.c index 372feeaffea..06eaa5e4be2 100644 --- a/cmd-line-utils/readline/display.c +++ b/cmd-line-utils/readline/display.c @@ -21,14 +21,15 @@ 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ #define READLINE_LIBRARY +#ifndef _XOPEN_SOURCE +#define _XOPEN_SOURCE 500 +#endif + #include "config_readline.h" #include <sys/types.h> /* To get SuSE 9.3 to define wcwidth() (in wchar.h) */ -#ifndef __USE_XOPEN -#define __USE_XOPEN -#endif #if defined (HAVE_UNISTD_H) # include <unistd.h> @@ -48,10 +49,6 @@ #include "rldefs.h" #include "rlmbutil.h" -#ifdef HAVE_WCHAR_H -#include <wchar.h> -#endif - /* Termcap library stuff. */ #include "tcap.h" diff --git a/cmd-line-utils/readline/mbutil.c b/cmd-line-utils/readline/mbutil.c index 5cda8f3732d..284ea63aae4 100644 --- a/cmd-line-utils/readline/mbutil.c +++ b/cmd-line-utils/readline/mbutil.c @@ -21,14 +21,15 @@ 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ #define READLINE_LIBRARY +#ifndef _XOPEN_SOURCE +#define _XOPEN_SOURCE 500 +#endif + #include "config_readline.h" #include <sys/types.h> /* To get SuSE 9.3 to define wcwidth() (in wchar.h) */ -#ifndef __USE_XOPEN -#define __USE_XOPEN -#endif #include <fcntl.h> #include "posixjmp.h" @@ -50,10 +51,6 @@ #include "rldefs.h" #include "rlmbutil.h" -#ifdef HAVE_WCHAR_H -#include <wchar.h> -#endif - #if defined (TIOCSTAT_IN_SYS_IOCTL) # include <sys/ioctl.h> #endif /* TIOCSTAT_IN_SYS_IOCTL */ |