diff options
| author | Eli Zaretskii | 2011-01-31 21:36:08 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2011-01-31 21:36:08 +0200 |
| commit | 70b0d280eb5cfdf103603fb289064710ae7cd680 (patch) | |
| tree | 39963bbb02985fa36b64cf93dda48e8efbd7823a /nt/inc | |
| parent | 1dc4075fa8809805aed5092e93e225e889725c94 (diff) | |
| download | emacs-70b0d280eb5cfdf103603fb289064710ae7cd680.tar.gz emacs-70b0d280eb5cfdf103603fb289064710ae7cd680.zip | |
Fix the MS-Windows build broken by 2011-01-30T23:34:18Z!eggert@cs.ucla.edu and 2011-01-31T08:15:13Z!eggert@cs.ucla.edu.
lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/strftime.$(O) and
$(BLD)/time_r.$(O).
($(BLD)/dtoastr.$(O)): Depend on $(EMACS_ROOT)/src/s/ms-w32.h and
$(EMACS_ROOT)/src/m/intel386.h.
($(BLD)/strftime.$(O)):
($(BLD)/time_r.$(O)): Define prerequisites.
src/makefile.w32-in (OBJ2): Remove strftime.$(O).
($(BLD)/strftime.$(O)): Remove prerequisites.
lib-src/makefile.w32-in (VERSION): Don't define, defined on nt/config.nt.
(ECLIENT_CFLAGS): Remove -DVERSION.
($(BLD)/emacsclient.$(O)): Don't depend on makefile.w32-in.
nt/config.nt (VERSION): Uncomment definition.
(restrict): Define.
nt/inc/stdbool.h: New file.
admin/admin.el (set-version): Remove lib-src/makefile.w32-in. Add
nt/config.nt.
Diffstat (limited to 'nt/inc')
| -rw-r--r-- | nt/inc/stdbool.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/nt/inc/stdbool.h b/nt/inc/stdbool.h new file mode 100644 index 00000000000..521291fdd03 --- /dev/null +++ b/nt/inc/stdbool.h | |||
| @@ -0,0 +1,16 @@ | |||
| 1 | #ifndef _NT_STDBOOL_H_ | ||
| 2 | #define _NT_STDBOOL_H_ | ||
| 3 | /* | ||
| 4 | * stdbool.h exists in GCC, but not in MSVC. | ||
| 5 | */ | ||
| 6 | |||
| 7 | #ifdef __GNUC__ | ||
| 8 | # include_next <stdbool.h> | ||
| 9 | #else | ||
| 10 | # define _Bool signed char | ||
| 11 | # define bool _Bool | ||
| 12 | # define false 0 | ||
| 13 | # define true 1 | ||
| 14 | #endif | ||
| 15 | |||
| 16 | #endif /* _NT_STDBOOL_H_ */ | ||