summaryrefslogtreecommitdiff
path: root/cmd-line-utils
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2012-02-21 17:58:43 +0200
committerMichael Widenius <monty@askmonty.org>2012-02-21 17:58:43 +0200
commit6fbeed067b25a07542dd989b7a816969615d7df6 (patch)
tree91a1356648c282490729afd22476e9cf3b7fd0dc /cmd-line-utils
parent446554a15bd84f39ec4a8163e9f4456fa9be8fb2 (diff)
downloadmariadb-git-6fbeed067b25a07542dd989b7a816969615d7df6.tar.gz
Fixed that 'make distcheck' works with automake 1.11.11
Fixed compiler warnings found by buildbot Makefile.am: Removed extra empty line cmd-line-utils/libedit/sys.h: Fixed that strndup() doesn't give compiler warnings mysql-test/Makefile.am: Fixes for 'make distcheck' plugin/auth_pam/auth_pam.c: Ensure that prototype for strndup() is included on linux sql/share/Makefile.am: Fixes for 'make distcheck' storage/innodb_plugin/btr/btr0sea.c: Fixed compiler warning support-files/Makefile.am: Fixes for 'make distcheck'
Diffstat (limited to 'cmd-line-utils')
-rw-r--r--cmd-line-utils/libedit/sys.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/cmd-line-utils/libedit/sys.h b/cmd-line-utils/libedit/sys.h
index 33638d1565b..af55bcd7202 100644
--- a/cmd-line-utils/libedit/sys.h
+++ b/cmd-line-utils/libedit/sys.h
@@ -40,6 +40,17 @@
#ifndef _h_sys
#define _h_sys
+#ifdef __linux__
+/* Apparently we need _GNU_SOURCE defined to get access to wcsdup on Linux */
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#endif
+
+#ifndef __USE_XOPEN
+#define __USE_XOPEN
+#endif
+
#ifdef HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
@@ -92,17 +103,6 @@ size_t strlcpy(char *dst, const char *src, size_t size);
char *fgetln(FILE *fp, size_t *len);
#endif
-#ifdef __linux__
-/* Apparently we need _GNU_SOURCE defined to get access to wcsdup on Linux */
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-#endif
-
-#ifndef __USE_XOPEN
-#define __USE_XOPEN
-#endif
-
#include <wchar.h>
#include <wctype.h>