Skip to content

Commit 03dc17b

Browse files
committed
2025.1228 fix: 修复 Windows SDK winsock.h/winsock2.h 重定义冲突
1 parent 1dcb855 commit 03dc17b

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

packages/nipaplay_smb2/src/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ set(ENABLE_GSSAPI OFF CACHE BOOL "Enable gssapi support" FORCE)
1414

1515
if(WIN32)
1616
# libsmb2 headers use _WINDOWS to determine SOCKET types.
17-
add_definitions(-D_WINDOWS)
17+
# Avoid Windows SDK winsock.h/winsock2.h redefinition conflicts.
18+
add_definitions(-D_WINDOWS -D_WINSOCKAPI_ -DWIN32_LEAN_AND_MEAN -DNOMINMAX)
1819
endif()
1920

2021
add_subdirectory(

packages/nipaplay_smb2/src/nipaplay_smb2.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
#include <stdlib.h>
1313
#include <stdio.h>
1414
#include <string.h>
15+
#include <time.h>
1516

16-
#include <smb2/libsmb2-dcerpc-srvsvc.h>
17+
#include <smb2/smb2.h>
1718
#include <smb2/libsmb2.h>
1819
#include <smb2/libsmb2-raw.h>
1920

0 commit comments

Comments
 (0)