Subject: bug#14830: [PATCH] * configure.ac (HAVE_W32): Avoid nested functions

From: Peter Rosin <[email-masked]>
Date: Tue, 09 Jul 2013 10:07:28 +0200

On 2013-07-09 09:17, Andreas Schwab wrote:
> Peter Rosin <[email-masked]> writes:
> 
>> #include <windows.h>
>> #include <usp10.h>
>>
>> int
>> main ()
>> {
>>   PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader);
> 
> You need to declare pHeader somewhere.

Big sigh. Thanks for catching...

Cheers,
Peter

diff --git a/ChangeLog b/ChangeLog
index 220cffb..3ba3093 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-09  Peter Rosin <[email-masked]>  (tiny change>
+
+       * configure.ac (HAVE_W32): Avoid nested functions (the second
+       argument of AC_LANG_PROGRAM is already expanded inside a function).
+
 2013-07-08  Magnus Henoch <[email-masked]> (tiny change)

        * configure.ac (HAVE_IMAGEMAGICK): Check on NS also (Bug#14798).
diff --git a/configure.ac b/configure.ac
index 3830ee3..bb140a8 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)
--
1.7.9