diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2021-05-09 10:59:08 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2021-05-09 10:59:08 +0300 |
| commit | 4c3abb3dd105e075bf1cf55e3fe8b5ec2ac8e6cc (patch) | |
| tree | c531859e29220e5976f5127fb712fbcec21ae917 /src/w32term.c | |
| parent | 127f1f330b67228217fdcc0a552d37a33dc67bb9 (diff) | |
| download | emacs-4c3abb3dd105e075bf1cf55e3fe8b5ec2ac8e6cc.tar.gz emacs-4c3abb3dd105e075bf1cf55e3fe8b5ec2ac8e6cc.tar.bz2 emacs-4c3abb3dd105e075bf1cf55e3fe8b5ec2ac8e6cc.zip | |
Fix compilation errors with latest w32 API headers
* src/w32common.h: Rename OS_* to OS_SUBTYPE__*, as w32 API
headers started defining OS_NT, which breaks the use of the
enumeration. All users changed. (Bug#48303)
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/w32term.c b/src/w32term.c index 2de6b0d78c7..3b33b6bac13 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -1890,7 +1890,7 @@ w32_draw_image_foreground (struct glyph_string *s) /* HALFTONE produces better results, especially when scaling to a larger size, but Windows 9X doesn't support HALFTONE. */ - if (os_subtype == OS_NT + if (os_subtype == OS_SUBTYPE_NT && (pmode = SetStretchBltMode (s->hdc, HALFTONE)) != 0) SetBrushOrgEx (s->hdc, 0, 0, NULL); StretchBlt (s->hdc, x, y, s->slice.width, s->slice.height, @@ -1926,7 +1926,7 @@ w32_draw_image_foreground (struct glyph_string *s) { int pmode = 0; /* Windows 9X doesn't support HALFTONE. */ - if (os_subtype == OS_NT + if (os_subtype == OS_SUBTYPE_NT && (pmode = SetStretchBltMode (s->hdc, HALFTONE)) != 0) SetBrushOrgEx (s->hdc, 0, 0, NULL); StretchBlt (s->hdc, x, y, s->slice.width, s->slice.height, @@ -6665,7 +6665,7 @@ frame_set_mouse_pixel_position (struct frame *f, int pix_x, int pix_y) /* When "mouse trails" are in effect, moving the mouse cursor sometimes leaves behind an annoying "ghost" of the pointer. Avoid that by momentarily switching off mouse trails. */ - if (os_subtype == OS_NT + if (os_subtype == OS_SUBTYPE_NT && w32_major_version + w32_minor_version >= 6) ret = SystemParametersInfo (SPI_GETMOUSETRAILS, 0, &trail_num, 0); SetCursorPos (pt.x, pt.y); @@ -7652,7 +7652,7 @@ specified by `file-name-coding-system'. This variable is set to non-nil by default when Emacs runs on Windows systems of the NT family, including W2K, XP, Vista, Windows 7 and Windows 8. It is set to nil on Windows 9X. */); - if (os_subtype == OS_9X) + if (os_subtype == OS_SUBTYPE_9X) w32_unicode_filenames = 0; else w32_unicode_filenames = 1; |