summaryrefslogtreecommitdiff
path: root/include/my_global.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-05-11 09:18:00 +0200
committerSergei Golubchik <sergii@pisem.net>2012-05-11 09:18:00 +0200
commit329daad2d32730c1aade8134d1709383fe072309 (patch)
tree46a1f86728b6fc8f1a760251c0c0fe2d232a7431 /include/my_global.h
parent1185420da0964b2f06d9fd91bd02d067b0a359de (diff)
downloadmariadb-git-329daad2d32730c1aade8134d1709383fe072309.tar.gz
more portable fix for lp:942266 - 5.5 builds fail with systemtap-sdt-dev installed on Ubuntu
include <limits> early, before min/max macros are defined.
Diffstat (limited to 'include/my_global.h')
-rw-r--r--include/my_global.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h
index 8170ce381af..a5fa57dbfe3 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -1429,6 +1429,10 @@ static inline char *dlerror(void)
/* Length of decimal number represented by INT64. */
#define MY_INT64_NUM_DECIMAL_DIGITS 21
+#ifdef __cplusplus
+#include <limits> /* should be included before min/max macros */
+#endif
+
/* Define some useful general macros (should be done after all headers). */
#if !defined(max)
#define max(a, b) ((a) > (b) ? (a) : (b))