summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Langford <karen.langford@oracle.com>2011-10-29 20:08:40 +0200
committerKaren Langford <karen.langford@oracle.com>2011-10-29 20:08:40 +0200
commitaac03193362f8e68ccbc46743a52e830ce94f44f (patch)
tree0351b81a6eb80d041a8abbc84c80f56dae125c09
parent20ffbd3dd76b01acc967502385cd202f3912b19f (diff)
downloadmariadb-git-aac03193362f8e68ccbc46743a52e830ce94f44f.tar.gz
Patch to fix stdint.h missing from pre Solaris 10 versions.
-rw-r--r--cmd-line-utils/libedit/histedit.h5
-rw-r--r--cmd-line-utils/libedit/np/unvis.c7
2 files changed, 12 insertions, 0 deletions
diff --git a/cmd-line-utils/libedit/histedit.h b/cmd-line-utils/libedit/histedit.h
index 9f2b245f851..523d27b0be2 100644
--- a/cmd-line-utils/libedit/histedit.h
+++ b/cmd-line-utils/libedit/histedit.h
@@ -43,7 +43,12 @@
#define LIBEDIT_MAJOR 2
#define LIBEDIT_MINOR 11
+/* XXXMYSQL : stdint.h might not be available on older Solaris platforms. */
+#if defined(__sun) || defined(__sun__)
+#include <sys/inttypes.h>
+#else
#include <stdint.h>
+#endif
#include <sys/types.h>
#include <stdio.h>
diff --git a/cmd-line-utils/libedit/np/unvis.c b/cmd-line-utils/libedit/np/unvis.c
index 9267db71137..812d280b2d8 100644
--- a/cmd-line-utils/libedit/np/unvis.c
+++ b/cmd-line-utils/libedit/np/unvis.c
@@ -47,7 +47,14 @@ static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/4/93";
#include <assert.h>
#include <ctype.h>
+
+/* XXXMYSQL : stdint.h might not be available on older Solaris platforms. */
+#if defined(__sun) || defined(__sun__)
+#include <sys/inttypes.h>
+#else
#include <stdint.h>
+#endif
+
#include <stdio.h>
#include <errno.h>
/*