Commit c0a43775 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Fix build error on Ubuntu 11.10, if systemtap is installed.

The error is due to conflict between min/max macros in my_global.h
and system header < limits>, indirectly included via generated 
probes_mysql_dtrace.h

Temporarily undefined min/max for the inclusion of the probes_mysq_dtrace.h
parent 4e8bb265
......@@ -18,12 +18,29 @@
#define PROBES_MYSQL_H
#include <my_global.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"
#else
#include "probes_mysql_nodtrace.h"
#ifdef __linux__
#pragma pop_macro("min")
#pragma pop_macro("max")
#endif
#else /* no dtrace */
#include "probes_mysql_nodtrace.h"
#endif
#endif /* PROBES_MYSQL_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment