From: Peter Rosin <peda@lysator.liu.se>
Date: Tue, 9 Jul 2013 18:06:25 +0000 (+0300)
Subject: Avoid nexted functions in AC_LANG_PROGRAM test for Windows headers.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1864
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2aae948de5bf1ceda23c06310b331166532078e6;p=emacs.git

Avoid nexted functions in AC_LANG_PROGRAM test for Windows headers.

 configure.ac (HAVE_W32): Avoid nested functions (the second
 argument of AC_LANG_PROGRAM is already expanded inside a
 function).

Fixes: debbugs:14830
---

diff --git a/ChangeLog b/ChangeLog
index 6a451c85cde..579cd128ca4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-07-09  Peter Rosin  <peda@lysator.liu.se>  (tiny change>
+
+	* configure.ac (HAVE_W32): Avoid nested functions (the second
+	argument of AC_LANG_PROGRAM is already expanded inside a
+	function).  (Bug#14830)
+
 2013-07-09  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Port recent close-on-exec changes to Cygwin (Bug#14821).
diff --git a/configure.ac b/configure.ac
index 3830ee38cc9..bb140a86b1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1635,8 +1635,8 @@ if test "${opsys}" = "mingw32"; then
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
      #include <windows.h>
      #include <usp10.h>]],
-   [[void test(PIMAGE_NT_HEADERS pHeader)
-     {PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader);}]])],
+   [[PIMAGE_NT_HEADERS pHeader;
+     PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader)]])],
    [emacs_cv_w32api=yes
     HAVE_W32=yes],
    emacs_cv_w32api=no)