Changed __USE_XOPEN to _XOPEN_SOURCE and got rid of

some extra code.

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"

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"
 

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 */