From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 18 May 2013 11:03:26 +0000 (+0300)
Subject: Fix MS-Windows build with Guile.
X-Git-Tag: 3.99.91~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=943c06de479797fcda377c1cb95c644aace14919;p=thirdparty%2Fmake.git

Fix MS-Windows build with Guile.

 guile.c: Move inclusion of makeint.h before gnumake.h.  This
 order must be observed when building Make, because gnumake.h must
 be included with GMK_BUILDING_MAKE defined, which makeint.h
 already does.  Otherwise, the linker will look for, and fail to
 find, gmk_* functions in some external dynamic library.
---

diff --git a/ChangeLog b/ChangeLog
index 89755473..b6eb2610 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-05-18  Eli Zaretskii  <eliz@gnu.org>
+
+	* guile.c: Move inclusion of makeint.h before gnumake.h.  This
+	order must be observed when building Make, because gnumake.h must
+	be included with GMK_BUILDING_MAKE defined, which makeint.h
+	already does.  Otherwise, the linker will look for, and fail to
+	find, gmk_* functions in some external dynamic library.
+
 2013-05-17  Eli Zaretskii  <eliz@gnu.org>
 
 	* main.c (prepare_mutex_handle_string): Define conditioned on
diff --git a/guile.c b/guile.c
index c1408a75..f5637fd2 100644
--- a/guile.c
+++ b/guile.c
@@ -14,9 +14,9 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#include "makeint.h"
 #include "gnumake.h"
 
-#include "makeint.h"
 #include "debug.h"
 #include "dep.h"
 #include "variable.h"