aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authorale <ale@FreeBSD.org>2007-07-02 14:10:16 +0800
committerale <ale@FreeBSD.org>2007-07-02 14:10:16 +0800
commitd0a01af75467cc0cf13b54a82c06d05b18e91758 (patch)
treeb3820c6ace94ed6b961d2d7ac8d3c86afd6688ec /databases
parent5bb1d871a099602bd6d857d6f706caa8a7153e54 (diff)
downloadfreebsd-ports-gnome-d0a01af75467cc0cf13b54a82c06d05b18e91758.tar.gz
freebsd-ports-gnome-d0a01af75467cc0cf13b54a82c06d05b18e91758.tar.zst
freebsd-ports-gnome-d0a01af75467cc0cf13b54a82c06d05b18e91758.zip
Fix compilation with gcc4.2, by moving down mix/max definitions.
Submitted by: Huang wen hui <hwh@gddsn.org.cn>
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql51-server/files/patch-include_my_global.h27
-rw-r--r--databases/mysql54-server/files/patch-include_my_global.h27
-rw-r--r--databases/mysql55-server/files/patch-include_my_global.h27
-rw-r--r--databases/mysql60-server/files/patch-include_my_global.h27
-rw-r--r--databases/percona55-server/files/patch-include_my_global.h27
5 files changed, 135 insertions, 0 deletions
diff --git a/databases/mysql51-server/files/patch-include_my_global.h b/databases/mysql51-server/files/patch-include_my_global.h
new file mode 100644
index 000000000000..be6bf96f1841
--- /dev/null
+++ b/databases/mysql51-server/files/patch-include_my_global.h
@@ -0,0 +1,27 @@
+--- include/my_global.h.orig Mon Jul 2 08:06:55 2007
++++ include/my_global.h Mon Jul 2 08:07:53 2007
+@@ -561,12 +561,6 @@
+ #define PURIFY_OR_LINT_INIT(var)
+ #endif
+
+-/* Define some useful general macros */
+-#if !defined(max)
+-#define max(a, b) ((a) > (b) ? (a) : (b))
+-#define min(a, b) ((a) < (b) ? (a) : (b))
+-#endif
+-
+ #if !defined(HAVE_UINT)
+ #undef HAVE_UINT
+ #define HAVE_UINT
+@@ -1508,5 +1502,11 @@
+
+ /* Length of decimal number represented by INT64. */
+ #define MY_INT64_NUM_DECIMAL_DIGITS 21
++
++/* Define some useful general macros */
++#if !defined(max)
++#define max(a, b) ((a) > (b) ? (a) : (b))
++#define min(a, b) ((a) < (b) ? (a) : (b))
++#endif
+
+ #endif /* my_global_h */
diff --git a/databases/mysql54-server/files/patch-include_my_global.h b/databases/mysql54-server/files/patch-include_my_global.h
new file mode 100644
index 000000000000..be6bf96f1841
--- /dev/null
+++ b/databases/mysql54-server/files/patch-include_my_global.h
@@ -0,0 +1,27 @@
+--- include/my_global.h.orig Mon Jul 2 08:06:55 2007
++++ include/my_global.h Mon Jul 2 08:07:53 2007
+@@ -561,12 +561,6 @@
+ #define PURIFY_OR_LINT_INIT(var)
+ #endif
+
+-/* Define some useful general macros */
+-#if !defined(max)
+-#define max(a, b) ((a) > (b) ? (a) : (b))
+-#define min(a, b) ((a) < (b) ? (a) : (b))
+-#endif
+-
+ #if !defined(HAVE_UINT)
+ #undef HAVE_UINT
+ #define HAVE_UINT
+@@ -1508,5 +1502,11 @@
+
+ /* Length of decimal number represented by INT64. */
+ #define MY_INT64_NUM_DECIMAL_DIGITS 21
++
++/* Define some useful general macros */
++#if !defined(max)
++#define max(a, b) ((a) > (b) ? (a) : (b))
++#define min(a, b) ((a) < (b) ? (a) : (b))
++#endif
+
+ #endif /* my_global_h */
diff --git a/databases/mysql55-server/files/patch-include_my_global.h b/databases/mysql55-server/files/patch-include_my_global.h
new file mode 100644
index 000000000000..be6bf96f1841
--- /dev/null
+++ b/databases/mysql55-server/files/patch-include_my_global.h
@@ -0,0 +1,27 @@
+--- include/my_global.h.orig Mon Jul 2 08:06:55 2007
++++ include/my_global.h Mon Jul 2 08:07:53 2007
+@@ -561,12 +561,6 @@
+ #define PURIFY_OR_LINT_INIT(var)
+ #endif
+
+-/* Define some useful general macros */
+-#if !defined(max)
+-#define max(a, b) ((a) > (b) ? (a) : (b))
+-#define min(a, b) ((a) < (b) ? (a) : (b))
+-#endif
+-
+ #if !defined(HAVE_UINT)
+ #undef HAVE_UINT
+ #define HAVE_UINT
+@@ -1508,5 +1502,11 @@
+
+ /* Length of decimal number represented by INT64. */
+ #define MY_INT64_NUM_DECIMAL_DIGITS 21
++
++/* Define some useful general macros */
++#if !defined(max)
++#define max(a, b) ((a) > (b) ? (a) : (b))
++#define min(a, b) ((a) < (b) ? (a) : (b))
++#endif
+
+ #endif /* my_global_h */
diff --git a/databases/mysql60-server/files/patch-include_my_global.h b/databases/mysql60-server/files/patch-include_my_global.h
new file mode 100644
index 000000000000..be6bf96f1841
--- /dev/null
+++ b/databases/mysql60-server/files/patch-include_my_global.h
@@ -0,0 +1,27 @@
+--- include/my_global.h.orig Mon Jul 2 08:06:55 2007
++++ include/my_global.h Mon Jul 2 08:07:53 2007
+@@ -561,12 +561,6 @@
+ #define PURIFY_OR_LINT_INIT(var)
+ #endif
+
+-/* Define some useful general macros */
+-#if !defined(max)
+-#define max(a, b) ((a) > (b) ? (a) : (b))
+-#define min(a, b) ((a) < (b) ? (a) : (b))
+-#endif
+-
+ #if !defined(HAVE_UINT)
+ #undef HAVE_UINT
+ #define HAVE_UINT
+@@ -1508,5 +1502,11 @@
+
+ /* Length of decimal number represented by INT64. */
+ #define MY_INT64_NUM_DECIMAL_DIGITS 21
++
++/* Define some useful general macros */
++#if !defined(max)
++#define max(a, b) ((a) > (b) ? (a) : (b))
++#define min(a, b) ((a) < (b) ? (a) : (b))
++#endif
+
+ #endif /* my_global_h */
diff --git a/databases/percona55-server/files/patch-include_my_global.h b/databases/percona55-server/files/patch-include_my_global.h
new file mode 100644
index 000000000000..be6bf96f1841
--- /dev/null
+++ b/databases/percona55-server/files/patch-include_my_global.h
@@ -0,0 +1,27 @@
+--- include/my_global.h.orig Mon Jul 2 08:06:55 2007
++++ include/my_global.h Mon Jul 2 08:07:53 2007
+@@ -561,12 +561,6 @@
+ #define PURIFY_OR_LINT_INIT(var)
+ #endif
+
+-/* Define some useful general macros */
+-#if !defined(max)
+-#define max(a, b) ((a) > (b) ? (a) : (b))
+-#define min(a, b) ((a) < (b) ? (a) : (b))
+-#endif
+-
+ #if !defined(HAVE_UINT)
+ #undef HAVE_UINT
+ #define HAVE_UINT
+@@ -1508,5 +1502,11 @@
+
+ /* Length of decimal number represented by INT64. */
+ #define MY_INT64_NUM_DECIMAL_DIGITS 21
++
++/* Define some useful general macros */
++#if !defined(max)
++#define max(a, b) ((a) > (b) ? (a) : (b))
++#define min(a, b) ((a) < (b) ? (a) : (b))
++#endif
+
+ #endif /* my_global_h */