From 030d8f6d53c75203141f5ff470985c876740e46a Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Fri, 6 Dec 2019 13:53:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90windows=E4=B8=8B=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 3rdpart/media-server | 2 +-
 CMakeLists.txt       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/3rdpart/media-server b/3rdpart/media-server
index 358b7bd3..4325386b 160000
--- a/3rdpart/media-server
+++ b/3rdpart/media-server
@@ -1 +1 @@
-Subproject commit 358b7bd3bf89564371fed48797ad396882f9d130
+Subproject commit 4325386be318889b7815cdd86a2e83f05a059c81
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c72217d6..6d20b60d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,7 +168,7 @@ if (NOT WIN32)
     list(REMOVE_ITEM ToolKit_src_list ${ToolKit_Root}/win32/getopt.c)
 else()
     #防止Windows.h包含Winsock.h
-    add_definitions(-DWIN32_LEAN_AND_MEAN -DMP4V2_NO_STDINT_DEFS)
+    add_definitions(-DWIN32_LEAN_AND_MEAN -DMP4V2_NO_STDINT_DEFS -DOS_WINDOWS)
 endif ()
 
 #添加库