From b3759772d20e89537980d5d43a01ce4c2f2535a8 Mon Sep 17 00:00:00 2001 From: Brad King Date: Sat, 19 Aug 2023 06:17:16 -0400 Subject: [PATCH] win,fs: avoid winapi macro redefinition (#4123) Adjust include order to avoid redefining `CTL_CODE`, `FILE_READ_ACCESS`, and `FILE_WRITE_ACCESS`. Without this, compilation shows: ``` ...\um\winioctl.h(273): warning C4005: 'CTL_CODE': macro redefinition ...\src\win\winapi.h(4497): note: see previous definition of 'CTL_CODE' ...\um\winioctl.h(320): warning C4005: 'FILE_READ_ACCESS': macro redefinition ...\src\win\winapi.h(4488): note: see previous definition of 'FILE_READ_ACCESS' ...\um\winioctl.h(321): warning C4005: 'FILE_WRITE_ACCESS': macro redefinition ...\src\win\winapi.h(4492): note: see previous definition of 'FILE_WRITE_ACCESS' ``` --- src/win/fs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/win/fs.c b/src/win/fs.c index 4fc13b04..314a3543 100644 --- a/src/win/fs.c +++ b/src/win/fs.c @@ -31,13 +31,16 @@ #include #include "uv.h" + +/* requires , included via "uv.h" above, but needs to + be included before our "winapi.h", included via "internal.h" below. */ +#include + #include "internal.h" #include "req-inl.h" #include "handle-inl.h" #include "fs-fd-hash-inl.h" -#include - #define UV_FS_FREE_PATHS 0x0002 #define UV_FS_FREE_PTR 0x0008