From 5afd401817271d0266f7dc0dec61d9773ca0db3d Mon Sep 17 00:00:00 2001 From: Alex Dupre Date: Mon, 2 Jul 2007 06:10:16 +0000 Subject: Fix compilation with gcc4.2, by moving down mix/max definitions. Submitted by: Huang wen hui --- .../files/patch-include_my_global.h | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 databases/percona55-server/files/patch-include_my_global.h (limited to 'databases/percona55-server') 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 */ -- cgit v1.2.3