diff options
| author | Glenn Morris <rgm@gnu.org> | 2021-05-13 08:11:03 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2021-05-13 08:11:03 -0700 |
| commit | 3061409de2fae233e5e5f56893efe94519410921 (patch) | |
| tree | c79e3b5454c282caaac68937e9189f560248e652 /src/w32common.h | |
| parent | ff8bf8c8dfff2e4fc0fae50e3fcfcf3022bd0bb8 (diff) | |
| parent | bcd92b5708083a6c10d4f0aa785cbd69fd8f7035 (diff) | |
| download | emacs-3061409de2fae233e5e5f56893efe94519410921.tar.gz emacs-3061409de2fae233e5e5f56893efe94519410921.tar.bz2 emacs-3061409de2fae233e5e5f56893efe94519410921.zip | |
Merge from origin/emacs-27
bcd92b5708 (origin/emacs-27) Improve documentation of Hexl mode
c233f4eccd ; * etc/NEWS: Fix decoded-time-set-defaults typo.
4c3abb3dd1 Fix compilation errors with latest w32 API headers
127f1f330b Improve doc strings in log-edit.el
e36183ff46 ; * etc/TODO (etc/DOC): Update the todo entries.
# Conflicts:
# etc/NEWS
Diffstat (limited to 'src/w32common.h')
| -rw-r--r-- | src/w32common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/w32common.h b/src/w32common.h index cbe05c5d8d1..6493b9c88d5 100644 --- a/src/w32common.h +++ b/src/w32common.h @@ -41,8 +41,8 @@ extern int w32_minor_version; extern int w32_build_number; enum { - OS_9X = 1, - OS_NT + OS_SUBTYPE_9X = 1, + OS_SUBTYPE_NT }; extern int os_subtype; |