diff --git a/reactos/lib/rossym_new/CMakeLists.txt b/reactos/lib/rossym_new/CMakeLists.txt index 73387942ae8..0a63d5b3ca3 100644 --- a/reactos/lib/rossym_new/CMakeLists.txt +++ b/reactos/lib/rossym_new/CMakeLists.txt @@ -1,24 +1,25 @@ if(MSVC) -add_library(rossym dummy.c) + add_library(rossym dummy.c) else() -add_definitions(-D_NTSYSTEM_) -list(APPEND SOURCE - delete.c - dwarfabbrev.c - dwarfaranges.c - dwarfcfa.c - dwarfinfo.c - dwarfget.c - dwarfopen.c - dwarfpc.c - dwarfpubnames.c - find.c - fromfile.c - init.c - initum.c - pe.c - zwfile.c) -add_library(rossym ${SOURCE}) -add_dependencies(rossym psdk bugcodes) + add_definitions(-D_NTSYSTEM_) + list(APPEND SOURCE + delete.c + dwarfabbrev.c + dwarfaranges.c + dwarfcfa.c + dwarfget.c + dwarfinfo.c + dwarfopen.c + dwarfpc.c + dwarfpubnames.c + find.c + fromfile.c + init.c + initum.c + pe.c + zwfile.c) + add_library(rossym ${SOURCE}) + add_pch(rossym precomp.h) + add_dependencies(rossym psdk bugcodes) endif() diff --git a/reactos/lib/rossym_new/delete.c b/reactos/lib/rossym_new/delete.c index 1e6fe8393e2..314ff526f9e 100644 --- a/reactos/lib/rossym_new/delete.c +++ b/reactos/lib/rossym_new/delete.c @@ -7,17 +7,7 @@ * PROGRAMMERS: Ge van Geldorp (gvg@reactos.com) */ -#define NTOSAPI -#include -#include -#include - -#define NDEBUG -#include - -#include "rossympriv.h" -#include "pe.h" -#include "dwarf.h" +#include VOID RosSymDelete(PROSSYM_INFO RosSymInfo) diff --git a/reactos/lib/rossym_new/dwarfabbrev.c b/reactos/lib/rossym_new/dwarfabbrev.c index a9d3c49b027..87621b69547 100644 --- a/reactos/lib/rossym_new/dwarfabbrev.c +++ b/reactos/lib/rossym_new/dwarfabbrev.c @@ -6,18 +6,9 @@ * explicit reference counting if this turns out not to be acceptable. */ -#define NTOSAPI -#include -#include -#include "rossympriv.h" -#include +#include #define NDEBUG -#include - -#include "rossym.h" -#include "rossympriv.h" -#include "dwarf.h" static int parseabbrevs(Dwarf*, ulong, DwarfAbbrev*, DwarfAttr*, int*, int*); DwarfAbbrev *dwarfgetabbrev(Dwarf*, ulong, ulong); diff --git a/reactos/lib/rossym_new/dwarfaranges.c b/reactos/lib/rossym_new/dwarfaranges.c index cda4cd6453f..6a70309b9b5 100644 --- a/reactos/lib/rossym_new/dwarfaranges.c +++ b/reactos/lib/rossym_new/dwarfaranges.c @@ -2,16 +2,9 @@ * Dwarf address ranges parsing code. */ -#define NTOSAPI -#include -#include -#include "rossympriv.h" -#include +#include #define NDEBUG -#include - -#include "dwarf.h" int dwarfaddrtounit(Dwarf *d, ulong addr, ulong *unit) diff --git a/reactos/lib/rossym_new/dwarfcfa.c b/reactos/lib/rossym_new/dwarfcfa.c index 3c0c349ef44..25292d467e0 100644 --- a/reactos/lib/rossym_new/dwarfcfa.c +++ b/reactos/lib/rossym_new/dwarfcfa.c @@ -8,17 +8,9 @@ * the same encoding. */ -#define NTOSAPI -#include -#include -#include "rossympriv.h" -#include +#include #define NDEBUG -#include - -#include "pe.h" -#include "dwarf.h" #define trace 1 diff --git a/reactos/lib/rossym_new/dwarfget.c b/reactos/lib/rossym_new/dwarfget.c index 7787163a21b..71714ad818c 100644 --- a/reactos/lib/rossym_new/dwarfget.c +++ b/reactos/lib/rossym_new/dwarfget.c @@ -2,17 +2,9 @@ * Dwarf data format parsing routines. */ -#define NTOSAPI -#include -#include -#include "rossympriv.h" -#include +#include #define NDEBUG -#include - -#include "dwarf.h" -#include "pe.h" ulong dwarfget1(DwarfBuf *b) diff --git a/reactos/lib/rossym_new/dwarfinfo.c b/reactos/lib/rossym_new/dwarfinfo.c index 162282a7641..91342ed0128 100644 --- a/reactos/lib/rossym_new/dwarfinfo.c +++ b/reactos/lib/rossym_new/dwarfinfo.c @@ -2,19 +2,8 @@ * Dwarf info parse and search. */ -#define NTOSAPI -#include -#include -#include -#include "rossympriv.h" -#include - +#include #define NDEBUG -#include - -#include "dwarf.h" -#include "pe.h" -#include enum { diff --git a/reactos/lib/rossym_new/dwarfopen.c b/reactos/lib/rossym_new/dwarfopen.c index bcb0429ab40..602f50ab011 100644 --- a/reactos/lib/rossym_new/dwarfopen.c +++ b/reactos/lib/rossym_new/dwarfopen.c @@ -1,14 +1,6 @@ -#define NTOSAPI -#include -#include -#include "rossympriv.h" -#include +#include #define NDEBUG -#include - -#include "dwarf.h" -#include "pe.h" /* Adapted for PE */ diff --git a/reactos/lib/rossym_new/dwarfpc.c b/reactos/lib/rossym_new/dwarfpc.c index ec41e10d16c..36b38ff887b 100644 --- a/reactos/lib/rossym_new/dwarfpc.c +++ b/reactos/lib/rossym_new/dwarfpc.c @@ -11,18 +11,9 @@ * The encoding may be small, but it sure isn't simple! */ -#define NTOSAPI -#include -#include -#include "rossympriv.h" -#include +#include #define NDEBUG -#include - -#include "dwarf.h" -#include "pe.h" - #define trace 0 enum diff --git a/reactos/lib/rossym_new/dwarfpubnames.c b/reactos/lib/rossym_new/dwarfpubnames.c index 8a8d802b797..2a605d8f398 100644 --- a/reactos/lib/rossym_new/dwarfpubnames.c +++ b/reactos/lib/rossym_new/dwarfpubnames.c @@ -1,12 +1,6 @@ -#define NTOSAPI -#include -#include -#include +#include #define NDEBUG -#include - -#include "dwarf.h" static int _dwarfnametounit(Dwarf *d, char *name, DwarfBlock *bl, DwarfSym *s) diff --git a/reactos/lib/rossym_new/find.c b/reactos/lib/rossym_new/find.c index beb6f170eea..89b64ff80d3 100644 --- a/reactos/lib/rossym_new/find.c +++ b/reactos/lib/rossym_new/find.c @@ -35,16 +35,9 @@ * SUCH DAMAGE. */ -#include -#include -#include "rossympriv.h" +#include #define NDEBUG -#include - -#include "rossym.h" -#include "dwarf.h" -#include "pe.h" BOOLEAN RosSymGetAddressInformation diff --git a/reactos/lib/rossym_new/fromfile.c b/reactos/lib/rossym_new/fromfile.c index a3ed16fd946..b157c817506 100644 --- a/reactos/lib/rossym_new/fromfile.c +++ b/reactos/lib/rossym_new/fromfile.c @@ -7,18 +7,7 @@ * PROGRAMMERS: Ge van Geldorp (gvg@reactos.com) */ -#define NTOSAPI -#include -#include -#include -#include "rossympriv.h" -#include "pe.h" -#include - -#include "dwarf.h" - -#define NDEBUG -#include +#include #define SYMBOL_SIZE 18 diff --git a/reactos/lib/rossym_new/init.c b/reactos/lib/rossym_new/init.c index 80be79a1ee0..d13fc09f0e4 100644 --- a/reactos/lib/rossym_new/init.c +++ b/reactos/lib/rossym_new/init.c @@ -7,9 +7,7 @@ * PROGRAMMERS: Ge van Geldorp (gvg@reactos.com) */ -#include -#include -#include "rossympriv.h" +#include ROSSYM_CALLBACKS RosSymCallbacks; diff --git a/reactos/lib/rossym_new/initum.c b/reactos/lib/rossym_new/initum.c index eb59c0f185e..0bc24694205 100644 --- a/reactos/lib/rossym_new/initum.c +++ b/reactos/lib/rossym_new/initum.c @@ -7,16 +7,7 @@ * PROGRAMMERS: Ge van Geldorp (gvg@reactos.com) */ -#define WIN32_NO_STATUS -#include -#include -#include "rossympriv.h" -#define NTOS_MODE_USER -#include -#include - -#define NDEBUG -#include +#include static PVOID RosSymAllocMemUM(ULONG_PTR Size) diff --git a/reactos/lib/rossym_new/pe.c b/reactos/lib/rossym_new/pe.c index 63fd9df6906..d5d4157aead 100644 --- a/reactos/lib/rossym_new/pe.c +++ b/reactos/lib/rossym_new/pe.c @@ -1,16 +1,6 @@ -#define NTOSAPI -#include -#include -#include -#include "rossympriv.h" -#include +#include #define NDEBUG -#include - -#include "dwarf.h" -#include "pe.h" -#include "rossympriv.h" PeSect *pesection(Pe *pe, const char *name) { diff --git a/reactos/lib/rossym_new/precomp.h b/reactos/lib/rossym_new/precomp.h new file mode 100644 index 00000000000..610de3cd594 --- /dev/null +++ b/reactos/lib/rossym_new/precomp.h @@ -0,0 +1,12 @@ +#define NTOSAPI +#include +#include +#include +#include +#include + +#include "rossympriv.h" +#include "pe.h" +#include "dwarf.h" + +#include diff --git a/reactos/lib/rossym_new/zwfile.c b/reactos/lib/rossym_new/zwfile.c index a6ce196c632..99556e4e8cd 100644 --- a/reactos/lib/rossym_new/zwfile.c +++ b/reactos/lib/rossym_new/zwfile.c @@ -7,13 +7,7 @@ * PROGRAMMERS: Ge van Geldorp (gvg@reactos.com) */ -#define NTOSAPI -#include -#include -#include "rossympriv.h" - -#define NDEBUG -#include +#include NTSTATUS RosSymStatus;