bzr commit into mysql-5.1 branch (build:2758)

[MySQL Build Team]

#At file:///net/helheim/store/bteam/bzr/mysql-5.1.32-release/

 2758 jperkin@stripped	2009-02-12
      More portability fixes.
modified:
  cmd-line-utils/libedit/makelist.sh
  cmd-line-utils/libedit/readline.c

=== modified file 'cmd-line-utils/libedit/makelist.sh'
--- a/cmd-line-utils/libedit/makelist.sh	2009-02-10 12:39:14 +0000
+++ b/cmd-line-utils/libedit/makelist.sh	2009-02-12 15:01:38 +0000
@@ -84,7 +84,7 @@ case $FLAG in
     cat $FILES | $AWK '
 	BEGIN {
 	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#include \"sys.h\"\n#include \"el.h\"\n");
+	    printf("#include \"config.h\"\n#include \"el.h\"\n");
 	    printf("private const struct el_bindings_t el_func_help[] = {\n");
 	    low = "abcdefghijklmnopqrstuvwxyz_";
 	    high = "ABCDEFGHIJKLMNOPQRSTUVWXYZ_";
@@ -169,7 +169,7 @@ case $FLAG in
     cat $FILES | $AWK '/el_action_t/ { print $3 }' | sort | $AWK '
 	BEGIN {
 	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#include \"sys.h\"\n#include \"el.h\"\n");
+	    printf("#include \"config.h\"\n#include \"el.h\"\n");
 	    printf("private const el_func_t el_func[] = {");
 	    maxlen = 80;
 	    needn = 1;

=== modified file 'cmd-line-utils/libedit/readline.c'
--- a/cmd-line-utils/libedit/readline.c	2009-02-10 12:39:14 +0000
+++ b/cmd-line-utils/libedit/readline.c	2009-02-12 15:01:38 +0000
@@ -51,13 +51,10 @@
 #else
 #include "np/vis.h"
 #endif
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
+#include "readline/readline.h"
 #include "el.h"
 #include "fcns.h"		/* for EL_NUM_FCNS */
 #include "histedit.h"
-#include "readline/readline.h"
 #include "filecomplete.h"
 
 void rl_prep_terminal(int);