2 files changed, 6 insertions, 0 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index dfc7b8d117f..4eda6f02d86 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-05  Eli Zaretskii  <eliz@gnu.org>
+
+        * configure.bat: Add check for usp10.h.
+
 2008-04-04  Jason Rumney  <jasonr@gnu.org>
 
         * INSTALL: Update W32 API requirements.
diff --git a/nt/configure.bat b/nt/configure.bat
index 87b02de0e9c..41c4528930d 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -282,9 +282,11 @@ rem   are like this), or have a typo in the definition of
 rem   IMAGE_FIRST_SECTION (the headers with gcc/mingw32 2.95 have this

 rem   problem).  The gcc/mingw32 2.95.2 headers are okay, as are distros

 rem   of w32api-xxx.zip from Anders Norlander since 1999-11-18 at least.

+rem   Beginning with Emacs 23, we need usp10.h.

 rem

 echo Checking whether W32 API headers are too old...

 echo #include "windows.h" >junk.c

+echo #include "usp10.h" >>junk.c

 echo test(PIMAGE_NT_HEADERS pHeader) >>junk.c

 echo {PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader);} >>junk.c

 if (%nocygwin%) == (Y) goto chkapi1