Skip to content

Commit 490f7af

Browse files
authored
[NETAPI32] Revert to Wine module (reactos#8004)
Partially revert reactos#7912. JIRA issue: CORE-5743 Use wine instead of wine2ros.
1 parent e2e6fcd commit 490f7af

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

dll/win32/netapi32/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ add_library(netapi32 MODULE
5151
${CMAKE_CURRENT_BINARY_DIR}/netapi32.def)
5252

5353
set_module_type(netapi32 win32dll)
54-
target_link_libraries(netapi32 wine2ros ${PSEH_LIB})
54+
target_link_libraries(netapi32 wine ${PSEH_LIB})
5555
add_delay_importlibs(netapi32 samlib secur32)
5656
add_importlibs(netapi32 iphlpapi ws2_32 advapi32 rpcrt4 msvcrt kernel32 ntdll)
5757
add_pch(netapi32 netapi32.h "${PCH_SKIP_SOURCE}")

dll/win32/netapi32/netapi32.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
#ifndef __WINE_NETAPI32_H__
22
#define __WINE_NETAPI32_H__
33

4-
#ifndef __REACTOS__
54
#include <wine/config.h>
6-
#endif
75

86
#include <limits.h>
97
#include <stdarg.h>
@@ -21,12 +19,8 @@
2119
#include <nb30.h>
2220
#include <iphlpapi.h>
2321

24-
#ifdef __REACTOS__
25-
#include <wine2ros.h>
26-
#else
2722
#include <wine/debug.h>
2823
#include <wine/unicode.h>
29-
#endif
3024

3125
#define NTOS_MODE_USER
3226
#include <ndk/rtlfuncs.h>

0 commit comments

Comments
 (0)