diff options
author | Eli Zaretskii <eliz@gnu.org> | 2013-05-06 20:18:58 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2013-05-06 20:18:58 +0300 |
commit | f0529dacedf7da83f8d5107a8ca7d73f35560894 (patch) | |
tree | a3aa2f614c6409aeac839882c0ef7d74c931aa19 | |
parent | a668c520b2aa80aef8eb6c71c7507e48e111a2ae (diff) | |
download | gunmake-f0529dacedf7da83f8d5107a8ca7d73f35560894.tar.gz |
Rearrange dllimport/dllexport declarations for MS-Windows.
gnumake.h (GMK_EXPORT) [_WIN32]: Move the dllexport declaration
here from makeint.h.
makeint.h (GMK_BUILDING_MAKE) [WINDOWS32]: Define before
including gnumake.h.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | gnumake.h | 4 | ||||
-rw-r--r-- | makeint.h | 6 |
3 files changed, 12 insertions, 4 deletions
@@ -1,5 +1,11 @@ 2013-05-06 Eli Zaretskii <eliz@gnu.org> + * gnumake.h (GMK_EXPORT) [_WIN32]: Move the dllexport declaration + here from makeint.h. + + * makeint.h (GMK_BUILDING_MAKE) [WINDOWS32]: Define before + including gnumake.h. + * doc/make.texi (Loaded Object Example): Add a note about building shared objects on MS-Windows. @@ -28,7 +28,9 @@ typedef struct #ifdef _WIN32 -# ifndef GMK_EXPORT +# ifdef GMK_BUILDING_MAKE +# define GMK_EXPORT __declspec(dllexport) +# else # define GMK_EXPORT __declspec(dllimport) # endif #else @@ -49,10 +49,10 @@ char *alloca (); /* Include the externally-visible content. Be sure to use the local one, and not one installed on the system. - Define GMK_EXPORT for proper selection of dllexport/dllimport declarations - for MS-Windows. */ + Define GMK_BUILDING_MAKE for proper selection of dllexport/dllimport + declarations for MS-Windows. */ #ifdef WINDOWS32 -# define GMK_EXPORT __declspec(dllexport) +# define GMK_BUILDING_MAKE #endif #include "gnumake.h" |