diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/libevent/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | extra/libevent/event.h | 2 | ||||
| -rw-r--r-- | extra/libevent/evutil.h | 17 |
3 files changed, 4 insertions, 18 deletions
diff --git a/extra/libevent/CMakeLists.txt b/extra/libevent/CMakeLists.txt index 66961502357..83a6cf0f220 100644 --- a/extra/libevent/CMakeLists.txt +++ b/extra/libevent/CMakeLists.txt @@ -1,7 +1,8 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/extra/libevent ${CMAKE_SOURCE_DIR}/extra/libevent/compat - ${CMAKE_SOURCE_DIR}/extra/libevent/WIN32-Code) + ${CMAKE_SOURCE_DIR}/extra/libevent/WIN32-Code + ${CMAKE_SOURCE_DIR}/include) IF(MSVC) ADD_DEFINITIONS("-DWIN32 -DHAVE_CONFIG_H") diff --git a/extra/libevent/event.h b/extra/libevent/event.h index 451ca895e2b..078c940770e 100644 --- a/extra/libevent/event.h +++ b/extra/libevent/event.h @@ -159,6 +159,8 @@ extern "C" { #endif +#include <my_attribute.h> + #include <event-config.h> #ifdef _EVENT_HAVE_SYS_TYPES_H #include <sys/types.h> diff --git a/extra/libevent/evutil.h b/extra/libevent/evutil.h index 46e4079715d..2cfcacb2e0e 100644 --- a/extra/libevent/evutil.h +++ b/extra/libevent/evutil.h @@ -171,21 +171,4 @@ ev_int64_t evutil_strtoll(const char *s, char **endptr, int base); } #endif -/* Define __attribute__ for platforms that doesn't suppor it */ - -#ifndef __attribute__ -# if !defined(__GNUC__) -# define __attribute__(A) -# else -# ifndef GCC_VERSION -# define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__) -# endif -# if GCC_VERSION < 2008 -# define __attribute__(A) -# elif defined(__cplusplus) && GCC_VERSION < 3004 -# define __attribute__(A) -# endif -# endif -#endif - #endif /* _EVUTIL_H_ */ |