diff options
| author | Eli Zaretskii | 2012-11-20 19:13:10 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-11-20 19:13:10 +0200 |
| commit | 9aef4c1281d3adc1a348d802dc3a7d192006ae33 (patch) | |
| tree | 355f39a3e84f585955c6fcb88febc5e45083bc72 | |
| parent | 3b0108c5ba5d2bae34877a7cf499a84f814c22ee (diff) | |
| download | emacs-9aef4c1281d3adc1a348d802dc3a7d192006ae33.tar.gz emacs-9aef4c1281d3adc1a348d802dc3a7d192006ae33.zip | |
Fix !ifdef in nmake.defs.
nt/nmake.defs: Use !if, not !ifdef. See
http://lists.gnu.org/archive/html/help-emacs-windows/2012-11/msg00027.html
for the details.
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/nmake.defs | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 42b04fd5d03..f11f1fc5fc5 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2012-11-20 Eli Zaretskii <eliz@gnu.org> | 1 | 2012-11-20 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * nmake.defs: Use !if, not !ifdef. See | ||
| 4 | http://lists.gnu.org/archive/html/help-emacs-windows/2012-11/msg00027.html | ||
| 5 | for the details. | ||
| 6 | |||
| 3 | * inc/stdint.h (INTPTR_MIN): Define for MSVC. | 7 | * inc/stdint.h (INTPTR_MIN): Define for MSVC. |
| 4 | 8 | ||
| 5 | 2012-11-19 Eli Zaretskii <eliz@gnu.org> | 9 | 2012-11-19 Eli Zaretskii <eliz@gnu.org> |
diff --git a/nt/nmake.defs b/nt/nmake.defs index 48809afc771..16a787ea30a 100644 --- a/nt/nmake.defs +++ b/nt/nmake.defs | |||
| @@ -116,7 +116,7 @@ RC_INCLUDE = -i | |||
| 116 | 116 | ||
| 117 | USE_CRT_DLL = 1 | 117 | USE_CRT_DLL = 1 |
| 118 | 118 | ||
| 119 | !ifdef USE_CRT_DLL | 119 | !if USE_CRT_DLL |
| 120 | libc = msvcrt$(D).lib | 120 | libc = msvcrt$(D).lib |
| 121 | EMACS_EXTRA_C_FLAGS= -D_DLL -D_MT -DUSE_CRT_DLL=1 | 121 | EMACS_EXTRA_C_FLAGS= -D_DLL -D_MT -DUSE_CRT_DLL=1 |
| 122 | !else | 122 | !else |