diff --git a/ChangeLog b/ChangeLog index 5c9f07e..9c4a5bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,11 @@ 2009-01-31 Nicola Pero - * objc/objc-decls.h: Use BUILD_libobjc_DLL (as defined by - gnustep-make), not DLL_EXPORT (as defined by libtool, which we - don't use), to decide when to export/import symbols on MinGW32. - + * objc/objc-decls.h: Reverted last change to get it to compile + again on MinGW32. If we're on Windows, but not MinGW32, use + BUILD_libobjc_DLL (as defined by gnustep-make), not DLL_EXPORT (as + defined by libtool, which we don't use), to decide when to + export/import symbols. + 2008-12-19 Nicola Pero * GNUmakefile (GNUSTEP_CORE_SOFTWARE): Do not set. diff --git a/objc/objc-decls.h b/objc/objc-decls.h index ef1ae15..a9f67a1 100644 --- a/objc/objc-decls.h +++ b/objc/objc-decls.h @@ -27,7 +27,10 @@ Boston, MA 02110-1301, USA. */ #ifndef __objc_decls_INCLUDE_GNU #define __objc_decls_INCLUDE_GNU -#if (defined (_WIN32) || defined (__WIN32__) || defined (WIN32)) +#if !defined(__MINGW32__) && (defined (_WIN32) || defined (__WIN32__) || defined (WIN32)) + +# The following code is not needed on MinGW >= 5.1.3 since the compiler will automatically +# determine which symbols to import/export, at least when compiling using gnustep-make. #ifdef BUILD_libobjc_DLL /* defined by gnustep-make when compiling libobjc itself */ # define objc_EXPORT __declspec(dllexport)