From 83f40697e2b6f2c89275a1e9d3cc6b6e347d3da4 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 22 Sep 2015 09:15:51 +0800 Subject: [PATCH] refine the hpp macro defines. --- trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj | 2 ++ trunk/src/protocol/srs_rtmp_handshake.hpp | 4 ++-- trunk/src/protocol/srs_rtmp_msg_array.hpp | 4 ++-- trunk/src/protocol/srs_rtmp_stack.hpp | 4 ++-- trunk/src/protocol/srs_rtsp_stack.hpp | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj b/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj index 9a4199019..b8de570cf 100644 --- a/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj +++ b/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj @@ -331,6 +331,7 @@ 3C36DB581ABD1CB90066CCAF /* srs_lib_simple_socket.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_lib_simple_socket.hpp; path = ../../../src/libs/srs_lib_simple_socket.hpp; sourceTree = ""; }; 3C36DB591ABD1CB90066CCAF /* srs_librtmp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_librtmp.cpp; path = ../../../src/libs/srs_librtmp.cpp; sourceTree = ""; }; 3C36DB5A1ABD1CB90066CCAF /* srs_librtmp.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_librtmp.hpp; path = ../../../src/libs/srs_librtmp.hpp; sourceTree = ""; }; + 3C4468E81BB0E31300589C9D /* sources_replace.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = sources_replace.sh; path = ../../../scripts/sources_replace.sh; sourceTree = ""; }; 3C4AB9311B8C9148006627D3 /* srs_app_ng_exec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_app_ng_exec.cpp; path = ../../../src/app/srs_app_ng_exec.cpp; sourceTree = ""; }; 3C4AB9321B8C9148006627D3 /* srs_app_ng_exec.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_app_ng_exec.hpp; path = ../../../src/app/srs_app_ng_exec.hpp; sourceTree = ""; }; 3C4AB9341B8C9FF9006627D3 /* exec.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = exec.conf; path = ../../../conf/exec.conf; sourceTree = ""; }; @@ -633,6 +634,7 @@ 3C1232CC1AAE833300CE8F6C /* install.sh */, 3C1232CD1AAE833300CE8F6C /* package.sh */, 3C1232CE1AAE833300CE8F6C /* run.sh */, + 3C4468E81BB0E31300589C9D /* sources_replace.sh */, 3C1232CF1AAE833300CE8F6C /* srs.test */, 3C1232D01AAE833300CE8F6C /* stop.sh */, 3C1232D11AAE833300CE8F6C /* test_configure.sh */, diff --git a/trunk/src/protocol/srs_rtmp_handshake.hpp b/trunk/src/protocol/srs_rtmp_handshake.hpp index d95ae93a5..dba24fc13 100644 --- a/trunk/src/protocol/srs_rtmp_handshake.hpp +++ b/trunk/src/protocol/srs_rtmp_handshake.hpp @@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef SRS_RTMP_PROTOCOL_HANDSHKAE_HPP -#define SRS_RTMP_PROTOCOL_HANDSHKAE_HPP +#ifndef SRS_PROTOCOL_HANDSHAKE_HPP +#define SRS_PROTOCOL_HANDSHAKE_HPP /* #include diff --git a/trunk/src/protocol/srs_rtmp_msg_array.hpp b/trunk/src/protocol/srs_rtmp_msg_array.hpp index a600c5caf..5a063bdb9 100644 --- a/trunk/src/protocol/srs_rtmp_msg_array.hpp +++ b/trunk/src/protocol/srs_rtmp_msg_array.hpp @@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef SRS_RTMP_PROTOCOL_MSG_ARRAY_HPP -#define SRS_RTMP_PROTOCOL_MSG_ARRAY_HPP +#ifndef SRS_PROTOCOL_MESSAGE_ARRAY_HPP +#define SRS_PROTOCOL_MESSAGE_ARRAY_HPP /* #include diff --git a/trunk/src/protocol/srs_rtmp_stack.hpp b/trunk/src/protocol/srs_rtmp_stack.hpp index cee3780c7..28b0a3af8 100644 --- a/trunk/src/protocol/srs_rtmp_stack.hpp +++ b/trunk/src/protocol/srs_rtmp_stack.hpp @@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef SRS_RTMP_PROTOCOL_STACK_HPP -#define SRS_RTMP_PROTOCOL_STACK_HPP +#ifndef SRS_PROTOCOL_RTMP_HPP +#define SRS_PROTOCOL_RTMP_HPP /* #include diff --git a/trunk/src/protocol/srs_rtsp_stack.hpp b/trunk/src/protocol/srs_rtsp_stack.hpp index 4cfa6b6f0..d8b83c82f 100644 --- a/trunk/src/protocol/srs_rtsp_stack.hpp +++ b/trunk/src/protocol/srs_rtsp_stack.hpp @@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef SRS_PROTOCOL_RTSP_STACK_HPP -#define SRS_PROTOCOL_RTSP_STACK_HPP +#ifndef SRS_PROTOCOL_RTSP_HPP +#define SRS_PROTOCOL_RTSP_HPP /* #include