diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-06-01 13:42:39 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-06-01 13:42:39 -0700 |
| commit | 27ab01243cbc7ddba29704afe31d0812652be19b (patch) | |
| tree | b50e061d5fe668cc49d270664a67422dd043e9d5 /include/probes_mysql.h | |
| parent | 6ac0363426f96c26c64447f0aa7fbd8a13ecc313 (diff) | |
| parent | afedd72e225654225b20a91b072b012e4c57a9d4 (diff) | |
| download | mariadb-git-27ab01243cbc7ddba29704afe31d0812652be19b.tar.gz | |
Merge
Diffstat (limited to 'include/probes_mysql.h')
| -rw-r--r-- | include/probes_mysql.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/probes_mysql.h b/include/probes_mysql.h index cc47c59b62d..6d44b972cb3 100644 --- a/include/probes_mysql.h +++ b/include/probes_mysql.h @@ -18,28 +18,8 @@ #define PROBES_MYSQL_H - #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" - -#ifdef __linux__ -#pragma pop_macro("min") -#pragma pop_macro("max") -#endif - #else /* no dtrace */ #include "probes_mysql_nodtrace.h" #endif |