From e1d334794ae22dfe707ff1b24d4dd4e850300d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Thu, 7 Mar 2024 13:07:23 +0100 Subject: [PATCH] [FREELDR][ROSSYM(_NEW)] Remove last vestigial references to "NTOSAPI". This was a MinGW-specific, non-MS-DDK/WDK-compatible define, that was used to mark NTOS kernel/hal exports, instead of NTSYSAPI etc. We have since fixed that, and changed the way Freeldr (and rossym) manages these, see commits: 186c8b72d (r16028), 51f0dfd30 (r17651) and 526efd2ee (r24359) --- boot/freeldr/freeldr/include/freeldr.h | 1 - sdk/lib/rossym/delete.c | 1 - sdk/lib/rossym/dwarfabbrev.c | 1 - sdk/lib/rossym/dwarfaranges.c | 1 - sdk/lib/rossym/dwarfcfa.c | 1 - sdk/lib/rossym/dwarfget.c | 1 - sdk/lib/rossym/dwarfinfo.c | 1 - sdk/lib/rossym/dwarfopen.c | 2 +- sdk/lib/rossym/dwarfpc.c | 1 - sdk/lib/rossym/dwarfpubnames.c | 2 +- sdk/lib/rossym/fromfile.c | 1 - sdk/lib/rossym/frommem.c | 1 - sdk/lib/rossym/fromraw.c | 1 - sdk/lib/rossym/getraw.c | 1 - sdk/lib/rossym/iofile.c | 1 - sdk/lib/rossym/pe.c | 2 +- sdk/lib/rossym/zwfile.c | 1 - sdk/lib/rossym_new/frommem.c | 1 - sdk/lib/rossym_new/fromraw.c | 1 - sdk/lib/rossym_new/getraw.c | 1 - sdk/lib/rossym_new/iofile.c | 1 - sdk/lib/rossym_new/precomp.h | 2 +- 22 files changed, 4 insertions(+), 22 deletions(-) diff --git a/boot/freeldr/freeldr/include/freeldr.h b/boot/freeldr/freeldr/include/freeldr.h index 91b196f5600..ca03b496b86 100644 --- a/boot/freeldr/freeldr/include/freeldr.h +++ b/boot/freeldr/freeldr/include/freeldr.h @@ -31,7 +31,6 @@ /* Public headers */ #ifdef __REACTOS__ -#define NTOSAPI #include #include #include diff --git a/sdk/lib/rossym/delete.c b/sdk/lib/rossym/delete.c index 65f694e63c0..951193e5d12 100644 --- a/sdk/lib/rossym/delete.c +++ b/sdk/lib/rossym/delete.c @@ -7,7 +7,6 @@ * PROGRAMMERS: Ge van Geldorp (gvg@reactos.com) */ -#define NTOSAPI #include #include #include "rossympriv.h" diff --git a/sdk/lib/rossym/dwarfabbrev.c b/sdk/lib/rossym/dwarfabbrev.c index b5cf60bd548..e26962c1101 100644 --- a/sdk/lib/rossym/dwarfabbrev.c +++ b/sdk/lib/rossym/dwarfabbrev.c @@ -6,7 +6,6 @@ * explicit reference counting if this turns out not to be acceptable. */ -#define NTOSAPI #include #include #include "rossympriv.h" diff --git a/sdk/lib/rossym/dwarfaranges.c b/sdk/lib/rossym/dwarfaranges.c index e9e82c1f8fc..497a76b36f4 100644 --- a/sdk/lib/rossym/dwarfaranges.c +++ b/sdk/lib/rossym/dwarfaranges.c @@ -2,7 +2,6 @@ * Dwarf address ranges parsing code. */ -#define NTOSAPI #include #include #include "rossympriv.h" diff --git a/sdk/lib/rossym/dwarfcfa.c b/sdk/lib/rossym/dwarfcfa.c index 41970587e3a..72aab355fcb 100644 --- a/sdk/lib/rossym/dwarfcfa.c +++ b/sdk/lib/rossym/dwarfcfa.c @@ -8,7 +8,6 @@ * the same encoding. */ -#define NTOSAPI #include #include #include "rossympriv.h" diff --git a/sdk/lib/rossym/dwarfget.c b/sdk/lib/rossym/dwarfget.c index d32177cd1db..e2df849a94f 100644 --- a/sdk/lib/rossym/dwarfget.c +++ b/sdk/lib/rossym/dwarfget.c @@ -2,7 +2,6 @@ * Dwarf data format parsing routines. */ -#define NTOSAPI #include #include #include "rossympriv.h" diff --git a/sdk/lib/rossym/dwarfinfo.c b/sdk/lib/rossym/dwarfinfo.c index 1d71d8a1cc8..8d6346fc51e 100644 --- a/sdk/lib/rossym/dwarfinfo.c +++ b/sdk/lib/rossym/dwarfinfo.c @@ -2,7 +2,6 @@ * Dwarf info parse and search. */ -#define NTOSAPI #include #include #include diff --git a/sdk/lib/rossym/dwarfopen.c b/sdk/lib/rossym/dwarfopen.c index 9a5f20c80fa..414d0130288 100644 --- a/sdk/lib/rossym/dwarfopen.c +++ b/sdk/lib/rossym/dwarfopen.c @@ -1,4 +1,4 @@ -#define NTOSAPI + #include #include #include "rossympriv.h" diff --git a/sdk/lib/rossym/dwarfpc.c b/sdk/lib/rossym/dwarfpc.c index 2bb863d0f48..8b1c68c4467 100644 --- a/sdk/lib/rossym/dwarfpc.c +++ b/sdk/lib/rossym/dwarfpc.c @@ -11,7 +11,6 @@ * The encoding may be small, but it sure isn't simple! */ -#define NTOSAPI #include #include #include "rossympriv.h" diff --git a/sdk/lib/rossym/dwarfpubnames.c b/sdk/lib/rossym/dwarfpubnames.c index 8a8d802b797..fe8c6755698 100644 --- a/sdk/lib/rossym/dwarfpubnames.c +++ b/sdk/lib/rossym/dwarfpubnames.c @@ -1,4 +1,4 @@ -#define NTOSAPI + #include #include #include diff --git a/sdk/lib/rossym/fromfile.c b/sdk/lib/rossym/fromfile.c index fbefb637959..6c653bf5af4 100644 --- a/sdk/lib/rossym/fromfile.c +++ b/sdk/lib/rossym/fromfile.c @@ -7,7 +7,6 @@ * PROGRAMMERS: Ge van Geldorp (gvg@reactos.com) */ -#define NTOSAPI #include #include #include "rossympriv.h" diff --git a/sdk/lib/rossym/frommem.c b/sdk/lib/rossym/frommem.c index 21f8334585d..b94edea7b3b 100644 --- a/sdk/lib/rossym/frommem.c +++ b/sdk/lib/rossym/frommem.c @@ -7,7 +7,6 @@ * PROGRAMMERS: Ge van Geldorp (gvg@reactos.com) */ -#define NTOSAPI #include #include #include "rossympriv.h" diff --git a/sdk/lib/rossym/fromraw.c b/sdk/lib/rossym/fromraw.c index 33be4fd6003..f5cb3f670fc 100644 --- a/sdk/lib/rossym/fromraw.c +++ b/sdk/lib/rossym/fromraw.c @@ -7,7 +7,6 @@ * PROGRAMMERS: Ge van Geldorp (gvg@reactos.com) */ -#define NTOSAPI #include #include #include "rossympriv.h" diff --git a/sdk/lib/rossym/getraw.c b/sdk/lib/rossym/getraw.c index 6635f19de94..6ad751e95f9 100644 --- a/sdk/lib/rossym/getraw.c +++ b/sdk/lib/rossym/getraw.c @@ -7,7 +7,6 @@ * PROGRAMMERS: Ge van Geldorp (gvg@reactos.com) */ -#define NTOSAPI #include #include #include "rossympriv.h" diff --git a/sdk/lib/rossym/iofile.c b/sdk/lib/rossym/iofile.c index 97069c50076..b0cf99a795c 100644 --- a/sdk/lib/rossym/iofile.c +++ b/sdk/lib/rossym/iofile.c @@ -7,7 +7,6 @@ * PROGRAMMERS: Ge van Geldorp (gvg@reactos.com) */ -#define NTOSAPI #include #include #include "rossympriv.h" diff --git a/sdk/lib/rossym/pe.c b/sdk/lib/rossym/pe.c index e86e2196f9f..4d84bc4ddaf 100644 --- a/sdk/lib/rossym/pe.c +++ b/sdk/lib/rossym/pe.c @@ -1,4 +1,4 @@ -#define NTOSAPI + #include #include #include diff --git a/sdk/lib/rossym/zwfile.c b/sdk/lib/rossym/zwfile.c index 7711014392e..772e8f06c69 100644 --- a/sdk/lib/rossym/zwfile.c +++ b/sdk/lib/rossym/zwfile.c @@ -7,7 +7,6 @@ * PROGRAMMERS: Ge van Geldorp (gvg@reactos.com) */ -#define NTOSAPI #include #include #include "rossympriv.h" diff --git a/sdk/lib/rossym_new/frommem.c b/sdk/lib/rossym_new/frommem.c index d4b2251a28d..33e186581e0 100644 --- a/sdk/lib/rossym_new/frommem.c +++ b/sdk/lib/rossym_new/frommem.c @@ -7,7 +7,6 @@ * PROGRAMMERS: Ge van Geldorp (gvg@reactos.com) */ -#define NTOSAPI #include #include #include diff --git a/sdk/lib/rossym_new/fromraw.c b/sdk/lib/rossym_new/fromraw.c index ae484252424..09ac986dbed 100644 --- a/sdk/lib/rossym_new/fromraw.c +++ b/sdk/lib/rossym_new/fromraw.c @@ -7,7 +7,6 @@ * PROGRAMMERS: Ge van Geldorp (gvg@reactos.com) */ -#define NTOSAPI #include #include #include "rossympriv.h" diff --git a/sdk/lib/rossym_new/getraw.c b/sdk/lib/rossym_new/getraw.c index 1f11057a38e..d6b09a63b4e 100644 --- a/sdk/lib/rossym_new/getraw.c +++ b/sdk/lib/rossym_new/getraw.c @@ -7,7 +7,6 @@ * PROGRAMMERS: Ge van Geldorp (gvg@reactos.com) */ -#define NTOSAPI #include #include #include "rossympriv.h" diff --git a/sdk/lib/rossym_new/iofile.c b/sdk/lib/rossym_new/iofile.c index 97069c50076..b0cf99a795c 100644 --- a/sdk/lib/rossym_new/iofile.c +++ b/sdk/lib/rossym_new/iofile.c @@ -7,7 +7,6 @@ * PROGRAMMERS: Ge van Geldorp (gvg@reactos.com) */ -#define NTOSAPI #include #include #include "rossympriv.h" diff --git a/sdk/lib/rossym_new/precomp.h b/sdk/lib/rossym_new/precomp.h index 13026f11122..76b1bd4f057 100644 --- a/sdk/lib/rossym_new/precomp.h +++ b/sdk/lib/rossym_new/precomp.h @@ -1,4 +1,4 @@ -#define NTOSAPI + #include #include #include