2006-11-13 Denis Pilat <denis.pilat@st.com>

[deliverable/binutils-gdb.git] / readline / rldefs.h

diff --git a/readline/rldefs.h b/readline/rldefs.h
index b80db8cffede5caabab4be7f70fd9cf4035552c8..0f6c87446ddd141f31cace5471dbdb063e8315bd 100644 (file)
--- a/readline/rldefs.h
+++ b/readline/rldefs.h
@@ -2,7 +2,7 @@
    for readline.  This should be included after any files that define
    system-specific constants like _POSIX_VERSION or USG. */
 
-/* Copyright (C) 1987,1989 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
 
    This file contains the Readline Library (the Library), a set of
    routines for providing Emacs style line input to programs that ask
@@ -32,15 +32,17 @@
 
 #include "rlstdc.h"
 
-#if defined (__MINGW32__)
-#  define NO_TTY_DRIVER
-#elif defined (_POSIX_VERSION) && !defined (TERMIOS_MISSING)
+#if defined (_POSIX_VERSION) && !defined (TERMIOS_MISSING)
 #  define TERMIOS_TTY_DRIVER
 #else
 #  if defined (HAVE_TERMIO_H)
 #    define TERMIO_TTY_DRIVER
 #  else
-#    define NEW_TTY_DRIVER
+#    if !defined (__MINGW32__)
+#      define NEW_TTY_DRIVER
+#    else
+#      define NO_TTY_DRIVER
+#    endif
 #  endif
 #endif
 
@@ -79,7 +81,7 @@ extern int _rl_stricmp PARAMS((char *, char *));
 extern int _rl_strnicmp PARAMS((char *, char *, int));
 #endif
 
-#if defined (HAVE_STRPBRK)
+#if defined (HAVE_STRPBRK) && !defined (HAVE_MULTIBYTE)
 #  define _rl_strpbrk(a,b)     strpbrk((a),(b))
 #else
 extern char *_rl_strpbrk PARAMS((const char *, const char *));