diff options
author | Azat Khuzhin <a3at.mail@gmail.com> | 2018-06-19 10:15:08 +0300 |
---|---|---|
committer | Azat Khuzhin <a3at.mail@gmail.com> | 2018-08-02 02:50:48 +0300 |
commit | e85818d24850540d220e6d7bc0a30653ba2135f2 (patch) | |
tree | 9030dff44f70971a5e1f24098c927621d61ddb2f /WIN32-Code | |
parent | c3a6fe75e1511a4c7a7a6ef0a5954b1918902933 (diff) | |
download | libevent-e85818d24850540d220e6d7bc0a30653ba2135f2.tar.gz |
Cleanup __func__ detection
First of all __func__ is not a macro, it is char[] array, so the code
that we had before in cmake, was incorrect, i.e.:
#if defined (__func__)
#define EVENT____func__ __func__
#elif defined(__FUNCTION__)
#define EVENT____func__ __FUNCTION__
#else
#define EVENT____func__ __FILE__
#endif
So just detect do we have __func__/__FUNCTION__ in configure/cmake
before build and define EVENT__HAVE___func__/EVENT__HAVE___FUNCTION__
to use the later to choose which should be used as a __func__ (if it is
not presented).
Closes: #644
Diffstat (limited to 'WIN32-Code')
-rw-r--r-- | WIN32-Code/nmake/event2/event-config.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WIN32-Code/nmake/event2/event-config.h b/WIN32-Code/nmake/event2/event-config.h index 45dd5069..2287a2e3 100644 --- a/WIN32-Code/nmake/event2/event-config.h +++ b/WIN32-Code/nmake/event2/event-config.h @@ -337,9 +337,6 @@ /* Version number of package */ #define EVENT__VERSION "2.2.0-alpha-dev" -/* Define to appropriate substitue if compiler doesnt have __func__ */ -#define EVENT____func__ __FUNCTION__ - /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #define EVENT__inline __inline |