summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2013-05-06 20:18:58 +0300
committerEli Zaretskii <eliz@gnu.org>2013-05-06 20:18:58 +0300
commitf0529dacedf7da83f8d5107a8ca7d73f35560894 (patch)
treea3aa2f614c6409aeac839882c0ef7d74c931aa19
parenta668c520b2aa80aef8eb6c71c7507e48e111a2ae (diff)
downloadgunmake-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--ChangeLog6
-rw-r--r--gnumake.h4
-rw-r--r--makeint.h6
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0427aa9..21e22ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/gnumake.h b/gnumake.h
index 168f370..8c622b7 100644
--- a/gnumake.h
+++ b/gnumake.h
@@ -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
diff --git a/makeint.h b/makeint.h
index 14a6c26..6bff07a 100644
--- a/makeint.h
+++ b/makeint.h
@@ -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"