From 717b358639225c4493ff1c31b2789e0c80b3fbd8 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 2 Jul 2013 22:08:23 +0000 Subject: Methinks the "not GCC 4 or later" #defines for WS_DLL_PUBLIC and WS_DLL_LOCAL were reversed; that might be what's causing a build error with ui/qt/main_status_bar.cpp. Add some comments for #else's while we're at it, so it's easier to figure out when particular sets of #defines are used. svn path=/trunk/; revision=50329 --- ws_symbol_export.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ws_symbol_export.h') diff --git a/ws_symbol_export.h b/ws_symbol_export.h index f17136aba2..14098ffea7 100644 --- a/ws_symbol_export.h +++ b/ws_symbol_export.h @@ -55,7 +55,7 @@ #else /* ! __GNUC__ */ #define WS_DLL_PUBLIC __declspec(dllexport) /* Note: actually gcc seems to also support this syntax. */ #endif /* __GNUC__ */ - #else + #else /* WS_BUILD_DLL */ #ifdef __GNUC__ #define WS_DLL_PUBLIC __attribute__ ((dllimport)) #elif ! (defined ENABLE_STATIC) /* ! __GNUC__ */ @@ -66,15 +66,15 @@ #endif /* WS_BUILD_DLL */ #define WS_DLL_PUBLIC_NOEXTERN WS_DLL_PUBLIC #define WS_DLL_LOCAL -#else +#else /* defined _WIN32 || defined __CYGWIN__ */ #if __GNUC__ >= 4 #define WS_DLL_PUBLIC __attribute__ ((visibility ("default"))) extern #define WS_DLL_PUBLIC_NOEXTERN __attribute__ ((visibility ("default"))) #define WS_DLL_LOCAL __attribute__ ((visibility ("hidden"))) #else /* ! __GNUC__ >= 4 */ - #define WS_DLL_PUBLIC + #define WS_DLL_PUBLIC extern #define WS_DLL_PUBLIC_NOEXTERN - #define WS_DLL_LOCAL extern + #define WS_DLL_LOCAL #endif /* __GNUC__ >= 4 */ #endif -- cgit v1.2.3