summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <andrey@lmy004.>2006-05-23 16:50:01 +0200
committerunknown <andrey@lmy004.>2006-05-23 16:50:01 +0200
commit05d44302b93f480fd2daefefbb8887ffe466ab0f (patch)
tree41cb3d7dc5f73447dc504261ae7c1e234d18132a
parent749f1832658ca68812431cac5a810a08ce3f47e6 (diff)
downloadmariadb-git-05d44302b93f480fd2daefefbb8887ffe466ab0f.tar.gz
__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: __FUNCTION__ is not available everywhere. make us see at least with gcc the function proto. this can be extended probably for windows too.
-rw-r--r--sql/event_scheduler.cc11
1 files 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 "<unknown>"
+#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