mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-24 09:15:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
This commit is contained in:
Vladislav Vaintroub 2012-02-29 18:25:25 +01:00
commit c0a4377575
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

25
include/probes_mysql.h
View file

@ -18,12 +18,29 @@
#define PROBES_MYSQL_H
#include <my_global.h>
#if defined(HAVE_DTRACE) && !defined(DISABLE_DTRACE)
#include "probes_mysql_dtrace.h"
#else
#include "probes_mysql_nodtrace.h"
#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
#endif /* PROBES_MYSQL_H */