https://git.reactos.org/?p=reactos.git;a=commitdiff;h=886670e914d45243e35afd45cfa72e2816f1798b
commit 886670e914d45243e35afd45cfa72e2816f1798b Author: Victor Perevertkin <[email protected]> AuthorDate: Tue Jan 31 19:27:33 2023 +0300 Commit: Victor Perevertkin <[email protected]> CommitDate: Tue Jan 31 20:18:18 2023 +0300 [DRIVERS] Remove unused __NTDRIVER__ and KERNEL definitions --- sdk/lib/3rdparty/freetype/CMakeLists.txt | 1 - sdk/lib/drivers/ip/CMakeLists.txt | 2 -- sdk/lib/drivers/ip/network/ip.c | 4 ---- sdk/lib/drivers/ip/transport/rawip/rawip.c | 2 -- sdk/lib/drivers/ip/transport/udp/udp.c | 2 -- sdk/lib/drivers/sound/legacy/CMakeLists.txt | 4 ---- sdk/lib/drivers/sound/shared/CMakeLists.txt | 4 ---- sdk/lib/drivers/sound/soundblaster/CMakeLists.txt | 4 ---- sdk/lib/drivers/sound/uartmidi/CMakeLists.txt | 4 ---- 9 files changed, 27 deletions(-) diff --git a/sdk/lib/3rdparty/freetype/CMakeLists.txt b/sdk/lib/3rdparty/freetype/CMakeLists.txt index e714504f97c..6eb1c346c51 100644 --- a/sdk/lib/3rdparty/freetype/CMakeLists.txt +++ b/sdk/lib/3rdparty/freetype/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions( - -D__NTDRIVER__ -DFT2_BUILD_LIBRARY) include_directories(include) diff --git a/sdk/lib/drivers/ip/CMakeLists.txt b/sdk/lib/drivers/ip/CMakeLists.txt index e772ebbae58..8065abe96d5 100644 --- a/sdk/lib/drivers/ip/CMakeLists.txt +++ b/sdk/lib/drivers/ip/CMakeLists.txt @@ -1,6 +1,4 @@ -add_definitions(-D__NTDRIVER__) - include_directories( BEFORE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/lwip/src/include diff --git a/sdk/lib/drivers/ip/network/ip.c b/sdk/lib/drivers/ip/network/ip.c index 0d8b729f5a1..1328be9b47c 100644 --- a/sdk/lib/drivers/ip/network/ip.c +++ b/sdk/lib/drivers/ip/network/ip.c @@ -235,9 +235,7 @@ PIP_INTERFACE IPCreateInterface( TCPRegisterInterface(IF); -#ifdef __NTDRIVER__ InsertTDIInterfaceEntity( IF ); -#endif return IF; } @@ -253,9 +251,7 @@ VOID IPDestroyInterface( { TI_DbgPrint(DEBUG_IP, ("Called. IF (0x%X).\n", IF)); -#ifdef __NTDRIVER__ RemoveTDIInterfaceEntity( IF ); -#endif TCPUnregisterInterface(IF); diff --git a/sdk/lib/drivers/ip/transport/rawip/rawip.c b/sdk/lib/drivers/ip/transport/rawip/rawip.c index cb32d4b02e3..ca985301f44 100644 --- a/sdk/lib/drivers/ip/transport/rawip/rawip.c +++ b/sdk/lib/drivers/ip/transport/rawip/rawip.c @@ -341,9 +341,7 @@ NTSTATUS RawIPStartup(VOID) * Status of operation */ { -#ifdef __NTDRIVER__ RtlZeroMemory(&UDPStats, sizeof(UDP_STATISTICS)); -#endif /* Register this protocol with IP layer */ IPRegisterProtocol(IPPROTO_RAW, RawIpReceive); diff --git a/sdk/lib/drivers/ip/transport/udp/udp.c b/sdk/lib/drivers/ip/transport/udp/udp.c index 0ad09fa7bf3..96d5ab684bf 100644 --- a/sdk/lib/drivers/ip/transport/udp/udp.c +++ b/sdk/lib/drivers/ip/transport/udp/udp.c @@ -343,9 +343,7 @@ NTSTATUS UDPStartup( { NTSTATUS Status; -#ifdef __NTDRIVER__ RtlZeroMemory(&UDPStats, sizeof(UDP_STATISTICS)); -#endif Status = PortsStartup( &UDPPorts, 1, UDP_STARTING_PORT + UDP_DYNAMIC_PORTS ); diff --git a/sdk/lib/drivers/sound/legacy/CMakeLists.txt b/sdk/lib/drivers/sound/legacy/CMakeLists.txt index 237044773bb..a69f4de3f65 100644 --- a/sdk/lib/drivers/sound/legacy/CMakeLists.txt +++ b/sdk/lib/drivers/sound/legacy/CMakeLists.txt @@ -1,8 +1,4 @@ -add_definitions( - -D__NTDRIVER__ - -DKERNEL) - include_directories( ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/sound/soundblaster ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/sound) diff --git a/sdk/lib/drivers/sound/shared/CMakeLists.txt b/sdk/lib/drivers/sound/shared/CMakeLists.txt index 855e98bda78..0032a6737e8 100644 --- a/sdk/lib/drivers/sound/shared/CMakeLists.txt +++ b/sdk/lib/drivers/sound/shared/CMakeLists.txt @@ -1,8 +1,4 @@ -add_definitions( - -D__NTDRIVER__ - -DKERNEL) - include_directories( ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/sound/soundblaster ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/sound) diff --git a/sdk/lib/drivers/sound/soundblaster/CMakeLists.txt b/sdk/lib/drivers/sound/soundblaster/CMakeLists.txt index 4b717a37fb6..a3decbbd259 100644 --- a/sdk/lib/drivers/sound/soundblaster/CMakeLists.txt +++ b/sdk/lib/drivers/sound/soundblaster/CMakeLists.txt @@ -1,8 +1,4 @@ -add_definitions( - -D__NTDRIVER__ - -DKERNEL) - include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/sound) list(APPEND SOURCE diff --git a/sdk/lib/drivers/sound/uartmidi/CMakeLists.txt b/sdk/lib/drivers/sound/uartmidi/CMakeLists.txt index c42b8f89122..6046afb6fc1 100644 --- a/sdk/lib/drivers/sound/uartmidi/CMakeLists.txt +++ b/sdk/lib/drivers/sound/uartmidi/CMakeLists.txt @@ -1,8 +1,4 @@ -add_definitions( - -D__NTDRIVER__ - -DKERNEL) - include_directories( ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/sound/soundblaster ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/sound)
