diff options
| author | Peter Rosin <peda@lysator.liu.se> | 2013-07-09 21:06:25 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-07-09 21:06:25 +0300 |
| commit | 2aae948de5bf1ceda23c06310b331166532078e6 (patch) | |
| tree | db9a3a8ceb5be2b83ab0190ced0903b33d064d33 | |
| parent | 7b154deff5f593d056b54d81baf627dcea6bb149 (diff) | |
| download | emacs-2aae948de5bf1ceda23c06310b331166532078e6.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 8 insertions, 2 deletions
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) |