database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

more portable fix for lp:942266 - 5.5 builds fail with systemtap-sdt-dev installed on Ubuntu

Browse Source 
include <limits> early, before min/max macros are defined.
This commit is contained in:
Sergei Golubchik
2012-05-11 09:18:00 +02:00
parent 1185420da0
commit 329daad2d3
2 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/my_global.h
View File

@@ -1429,6 +1429,10 @@ static inline char *dlerror(void)
/* Length of decimal number represented by INT64. */ /* Length of decimal number represented by INT64. */
#define MY_INT64_NUM_DECIMAL_DIGITS 21 #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). */ /* Define some useful general macros (should be done after all headers). */
#if !defined(max) #if !defined(max)
#define max(a, b) ((a) > (b) ? (a) : (b)) #define max(a, b) ((a) > (b) ? (a) : (b))

20
include/probes_mysql.h
View File

@@ -18,28 +18,8 @@
#define PROBES_MYSQL_H #define PROBES_MYSQL_H
#if defined(HAVE_DTRACE) && !defined(DISABLE_DTRACE) #if defined(HAVE_DTRACE) && !defined(DISABLE_DTRACE)
#ifdef __linux__
/*
On Linux, generated probes header may include C++ header
<limits> which conflicts with min and max macros from my_global.h .
To fix, temporarily undefine the macros.
*/
#pragma push_macro("min")
#pragma push_macro("max")
#undef min
#undef max
#endif
#include "probes_mysql_dtrace.h" #include "probes_mysql_dtrace.h"
#ifdef __linux__
#pragma pop_macro("min")
#pragma pop_macro("max")
#endif
#else /* no dtrace */ #else /* no dtrace */
#include "probes_mysql_nodtrace.h" #include "probes_mysql_nodtrace.h"
#endif #endif