Index: trunk/2.0/mysql/extra/innochecksum.c
===================================================================
--- trunk/2.0/mysql/extra/innochecksum.c	(revision 38)
+++ trunk/2.0/mysql/extra/innochecksum.c	(revision 39)
@@ -27,7 +27,9 @@
 #define _LARGEFILE_SOURCE
 #define _LARGEFILE64_SOURCE
 
+#ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 500 /* needed to include getopt.h on some platforms. */
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
Index: trunk/2.0/mysql/cmd-line-utils/libedit/np/vis.c
===================================================================
--- trunk/2.0/mysql/cmd-line-utils/libedit/np/vis.c	(revision 38)
+++ trunk/2.0/mysql/cmd-line-utils/libedit/np/vis.c	(revision 39)
@@ -90,7 +90,9 @@
 #undef BELL
 #define BELL '\a'
 
+#ifndef isoctal
 #define isoctal(c)	(((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
+#endif
 #define iswhite(c)	(c == ' ' || c == '\t' || c == '\n')
 #define issafe(c)	(c == '\b' || c == BELL || c == '\r')
 #define xtoa(c)		"0123456789abcdef"[c]
Index: trunk/2.0/mysql/cmd-line-utils/libedit/np/unvis.c
===================================================================
--- trunk/2.0/mysql/cmd-line-utils/libedit/np/unvis.c	(revision 38)
+++ trunk/2.0/mysql/cmd-line-utils/libedit/np/unvis.c	(revision 39)
@@ -67,7 +67,9 @@
 #define	S_HEX1		7	/* hex digit */
 #define	S_HEX2		8	/* hex digit 2 */
 
+#ifndef	isoctal
 #define	isoctal(c)	(((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
+#endif
 #define xtod(c)		(isdigit(c) ? (c - '0') : ((tolower(c) - 'a') + 10))
 
 /*