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 897554731eb42110ae6575b442af3e617358b753..b6eb26105f607b632bc6e0e6a020fa3d14097511 100644 (file)
--- 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 c1408a75d2709d344dfb31c1850b3298758928bb..f5637fd2eb431945ae846df45be60362fc990352 100644 (file)
--- 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"