From a1c30e48779466dcac35baabe9c8de945c1ce8fd Mon Sep 17 00:00:00 2001 From: "andrey@lmy004." <> Date: Tue, 23 May 2006 16:50:01 +0200 Subject: [PATCH] __FUNCTION__ is not available everywhere. make us see at least with gcc the function proto. this can be extended probably for windows too. Fix build on intelxeon3 (sun compiler and others) --- sql/event_scheduler.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sql/event_scheduler.cc b/sql/event_scheduler.cc index 784c87c0e8e..8bb43164e96 100644 --- a/sql/event_scheduler.cc +++ b/sql/event_scheduler.cc @@ -236,9 +236,16 @@ about conditional variables used. */ +#ifdef __GNUC__ +#if __GNUC__ >= 2 +#define SCHED_FUNC __FUNCTION__ +#endif +#else +#define SCHED_FUNC "" +#endif -#define LOCK_SCHEDULER_DATA() lock_data(__FUNCTION__,__LINE__) -#define UNLOCK_SCHEDULER_DATA() unlock_data(__FUNCTION__,__LINE__) +#define LOCK_SCHEDULER_DATA() lock_data(SCHED_FUNC, __LINE__) +#define UNLOCK_SCHEDULER_DATA() unlock_data(SCHED_FUNC, __LINE__) #ifndef DBUG_OFF