From 329daad2d32730c1aade8134d1709383fe072309 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 11 May 2012 09:18:00 +0200 Subject: more portable fix for lp:942266 - 5.5 builds fail with systemtap-sdt-dev installed on Ubuntu include early, before min/max macros are defined. --- include/probes_mysql.h | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'include/probes_mysql.h') 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 - 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 -- cgit v1.2.1