From bff1f2f8f62ad61527dc0d3decb2c78dd0048e04 Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Mon, 24 Jun 2019 14:58:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=A3=B0=E6=98=8E=E6=94=BE?= =?UTF-8?q?=E7=BD=AE=E4=BA=8E=E5=A4=B4=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/WebApi.h | 3 +++ server/WebHook.h | 2 ++ server/main.cpp | 7 +------ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/WebApi.h b/server/WebApi.h index bfc13fab..e758abed 100644 --- a/server/WebApi.h +++ b/server/WebApi.h @@ -45,4 +45,7 @@ extern const string kPort; } // namespace mediakit +void installWebApi(); +void unInstallWebApi(); + #endif //ZLMEDIAKIT_WEBAPI_H diff --git a/server/WebHook.h b/server/WebHook.h index 847c5d73..ce3b49bc 100644 --- a/server/WebHook.h +++ b/server/WebHook.h @@ -34,5 +34,7 @@ namespace Hook { extern const string kTimeoutSec; }//namespace Hook +void installWebHook(); +void unInstallWebHook(); #endif //ZLMEDIAKIT_WEBHOOK_H diff --git a/server/main.cpp b/server/main.cpp index 0c0f09bf..d6cfe252 100644 --- a/server/main.cpp +++ b/server/main.cpp @@ -44,6 +44,7 @@ #include "Player/PlayerProxy.h" #include "Http/WebSocketSession.h" #include "WebApi.h" +#include "WebHook.h" #if !defined(_WIN32) #include "System.h" @@ -157,12 +158,6 @@ public: } }; - -extern void installWebApi(); -extern void unInstallWebApi(); -extern void installWebHook(); -extern void unInstallWebHook(); - #if !defined(_WIN32) static void inline listen_shell_input(){ cout << "> 欢迎进入命令模式,你可以输入\"help\"命令获取帮助" << endl;