Commit 7f0f4c58 authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
parents 8d683973 ecf7f30b

cmd-line-utils/readline/bind.c

+1 −3
Original line number Diff line number Diff line
@@ -21,9 +21,7 @@ 
   59 Temple Place, Suite 330, Boston, MA 02111 USA. */

#define READLINE_LIBRARY



#if defined (HAVE_CONFIG_H)

#  include <config.h>

#endif

#include "config_readline.h"



#include <stdio.h>

#include <sys/types.h>

cmd-line-utils/readline/callback.c

+1 −3
Original line number Diff line number Diff line
@@ -21,9 +21,7 @@ 
   59 Temple Place, Suite 330, Boston, MA 02111 USA. */

#define READLINE_LIBRARY



#if defined (HAVE_CONFIG_H)

#  include <config.h>

#endif

#include "config_readline.h"



#include "rlconf.h"

cmd-line-utils/readline/complete.c

+1 −3
Original line number Diff line number Diff line
@@ -21,9 +21,7 @@ 
   59 Temple Place, Suite 330, Boston, MA 02111 USA. */

#define READLINE_LIBRARY



#if defined (HAVE_CONFIG_H)

#  include <config.h>

#endif

#include "config_readline.h"



#include <sys/types.h>

#include <fcntl.h>

cmd-line-utils/readline/config_readline.h

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/*

   config-readline.h  Maintained by hand. Contains the readline specific

   parts from config.h.in in readline 4.3

*/



#if defined (HAVE_CONFIG_H)

#  include <config.h>

#endif



/*

 Ultrix botches type-ahead when switching from canonical to

   non-canonical mode, at least through version 4.3

*/

#if !defined (HAVE_TERMIOS_H) || !defined (HAVE_TCGETATTR) || defined (ultrix)

#  define TERMIOS_MISSING

#endif



#if defined (STRCOLL_BROKEN)

#  undef HAVE_STRCOLL

#endif



#if defined (__STDC__) && defined (HAVE_STDARG_H)

#  define PREFER_STDARG

#  define USE_VARARGS

#else

#  if defined (HAVE_VARARGS_H)

#    define PREFER_VARARGS

#    define USE_VARARGS

#  endif

#endif

cmd-line-utils/readline/display.c

+1 −3
Original line number Diff line number Diff line
@@ -21,9 +21,7 @@ 
   59 Temple Place, Suite 330, Boston, MA 02111 USA. */

#define READLINE_LIBRARY



#if defined (HAVE_CONFIG_H)

#  include <config.h>

#endif

#include "config_readline.h"



#include <sys/types.h>