diff options
| author | Eli Zaretskii | 2008-04-05 08:17:20 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2008-04-05 08:17:20 +0000 |
| commit | 892508a40debc5eb8a055493d953e2b05132706b (patch) | |
| tree | 86aebd99e5b83c42dc991cbb870d63ec0f9b956d | |
| parent | 83a38a5a39bbd7a939d9dedcaab92340c03e14ab (diff) | |
| download | emacs-892508a40debc5eb8a055493d953e2b05132706b.tar.gz emacs-892508a40debc5eb8a055493d953e2b05132706b.zip | |
(chkapiN) Add check for usp10.h.
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rwxr-xr-x | nt/configure.bat | 2 |
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 @@ | |||
| 1 | 2008-04-05 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * configure.bat: Add check for usp10.h. | ||
| 4 | |||
| 1 | 2008-04-04 Jason Rumney <jasonr@gnu.org> | 5 | 2008-04-04 Jason Rumney <jasonr@gnu.org> |
| 2 | 6 | ||
| 3 | * INSTALL: Update W32 API requirements. | 7 | * 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 | |||
| 282 | rem IMAGE_FIRST_SECTION (the headers with gcc/mingw32 2.95 have this | 282 | rem IMAGE_FIRST_SECTION (the headers with gcc/mingw32 2.95 have this |
| 283 | rem problem). The gcc/mingw32 2.95.2 headers are okay, as are distros | 283 | rem problem). The gcc/mingw32 2.95.2 headers are okay, as are distros |
| 284 | rem of w32api-xxx.zip from Anders Norlander since 1999-11-18 at least. | 284 | rem of w32api-xxx.zip from Anders Norlander since 1999-11-18 at least. |
| 285 | rem Beginning with Emacs 23, we need usp10.h. | ||
| 285 | rem | 286 | rem |
| 286 | echo Checking whether W32 API headers are too old... | 287 | echo Checking whether W32 API headers are too old... |
| 287 | echo #include "windows.h" >junk.c | 288 | echo #include "windows.h" >junk.c |
| 289 | echo #include "usp10.h" >>junk.c | ||
| 288 | echo test(PIMAGE_NT_HEADERS pHeader) >>junk.c | 290 | echo test(PIMAGE_NT_HEADERS pHeader) >>junk.c |
| 289 | echo {PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader);} >>junk.c | 291 | echo {PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader);} >>junk.c |
| 290 | if (%nocygwin%) == (Y) goto chkapi1 | 292 | if (%nocygwin%) == (Y) goto chkapi1 |