summaryrefslogtreecommitdiff
path: root/src/w32heap.c
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2021-05-09 10:59:08 +0300
committerEli Zaretskii <eliz@gnu.org>2021-05-09 10:59:08 +0300
commit4c3abb3dd105e075bf1cf55e3fe8b5ec2ac8e6cc (patch)
treec531859e29220e5976f5127fb712fbcec21ae917 /src/w32heap.c
parent127f1f330b67228217fdcc0a552d37a33dc67bb9 (diff)
downloademacs-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/w32heap.c')
-rw-r--r--src/w32heap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/w32heap.c b/src/w32heap.c
index 07694d0f5cf..cdb8988e161 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -269,7 +269,7 @@ init_heap (bool use_dynamic_heap)
}
#endif
- if (os_subtype == OS_9X)
+ if (os_subtype == OS_SUBTYPE_9X)
{
the_malloc_fn = malloc_after_dump_9x;
the_realloc_fn = realloc_after_dump_9x;
@@ -312,7 +312,7 @@ init_heap (bool use_dynamic_heap)
}
heap = s_pfn_Rtl_Create_Heap (0, data_region_base, 0, 0, NULL, &params);
- if (os_subtype == OS_9X)
+ if (os_subtype == OS_SUBTYPE_9X)
{
fprintf (stderr, "Cannot dump Emacs on Windows 9X; exiting.\n");
exit (-1);