胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
83f40697 1 parent df6ac884

refine the hpp macro defines.

内嵌 并排对比
正在显示 5 个修改的文件 包含 10 行增加 和 8 行删除
@@ -331,6 +331,7 @@ @@ -331,6 +331,7 @@
331 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 = "<group>"; }; 331 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 = "<group>"; };
332 3C36DB591ABD1CB90066CCAF /* srs_librtmp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_librtmp.cpp; path = ../../../src/libs/srs_librtmp.cpp; sourceTree = "<group>"; }; 332 3C36DB591ABD1CB90066CCAF /* srs_librtmp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_librtmp.cpp; path = ../../../src/libs/srs_librtmp.cpp; sourceTree = "<group>"; };
333 3C36DB5A1ABD1CB90066CCAF /* srs_librtmp.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_librtmp.hpp; path = ../../../src/libs/srs_librtmp.hpp; sourceTree = "<group>"; }; 333 3C36DB5A1ABD1CB90066CCAF /* srs_librtmp.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_librtmp.hpp; path = ../../../src/libs/srs_librtmp.hpp; sourceTree = "<group>"; };
  334 + 3C4468E81BB0E31300589C9D /* sources_replace.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = sources_replace.sh; path = ../../../scripts/sources_replace.sh; sourceTree = "<group>"; };
334 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 = "<group>"; }; 335 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 = "<group>"; };
335 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 = "<group>"; }; 336 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 = "<group>"; };
336 3C4AB9341B8C9FF9006627D3 /* exec.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = exec.conf; path = ../../../conf/exec.conf; sourceTree = "<group>"; }; 337 3C4AB9341B8C9FF9006627D3 /* exec.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = exec.conf; path = ../../../conf/exec.conf; sourceTree = "<group>"; };
@@ -633,6 +634,7 @@ @@ -633,6 +634,7 @@
633 3C1232CC1AAE833300CE8F6C /* install.sh */, 634 3C1232CC1AAE833300CE8F6C /* install.sh */,
634 3C1232CD1AAE833300CE8F6C /* package.sh */, 635 3C1232CD1AAE833300CE8F6C /* package.sh */,
635 3C1232CE1AAE833300CE8F6C /* run.sh */, 636 3C1232CE1AAE833300CE8F6C /* run.sh */,
  637 + 3C4468E81BB0E31300589C9D /* sources_replace.sh */,
636 3C1232CF1AAE833300CE8F6C /* srs.test */, 638 3C1232CF1AAE833300CE8F6C /* srs.test */,
637 3C1232D01AAE833300CE8F6C /* stop.sh */, 639 3C1232D01AAE833300CE8F6C /* stop.sh */,
638 3C1232D11AAE833300CE8F6C /* test_configure.sh */, 640 3C1232D11AAE833300CE8F6C /* test_configure.sh */,
@@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN @@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22 */ 22 */
23 23
24 -#ifndef SRS_RTMP_PROTOCOL_HANDSHKAE_HPP  
25 -#define SRS_RTMP_PROTOCOL_HANDSHKAE_HPP 24 +#ifndef SRS_PROTOCOL_HANDSHAKE_HPP
  25 +#define SRS_PROTOCOL_HANDSHAKE_HPP
26 26
27 /* 27 /*
28 #include <srs_rtmp_handshake.hpp> 28 #include <srs_rtmp_handshake.hpp>
@@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN @@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22 */ 22 */
23 23
24 -#ifndef SRS_RTMP_PROTOCOL_MSG_ARRAY_HPP  
25 -#define SRS_RTMP_PROTOCOL_MSG_ARRAY_HPP 24 +#ifndef SRS_PROTOCOL_MESSAGE_ARRAY_HPP
  25 +#define SRS_PROTOCOL_MESSAGE_ARRAY_HPP
26 26
27 /* 27 /*
28 #include <srs_rtmp_msg_array.hpp> 28 #include <srs_rtmp_msg_array.hpp>
@@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN @@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22 */ 22 */
23 23
24 -#ifndef SRS_RTMP_PROTOCOL_STACK_HPP  
25 -#define SRS_RTMP_PROTOCOL_STACK_HPP 24 +#ifndef SRS_PROTOCOL_RTMP_HPP
  25 +#define SRS_PROTOCOL_RTMP_HPP
26 26
27 /* 27 /*
28 #include <srs_rtmp_stack.hpp> 28 #include <srs_rtmp_stack.hpp>
@@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN @@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22 */ 22 */
23 23
24 -#ifndef SRS_PROTOCOL_RTSP_STACK_HPP  
25 -#define SRS_PROTOCOL_RTSP_STACK_HPP 24 +#ifndef SRS_PROTOCOL_RTSP_HPP
  25 +#define SRS_PROTOCOL_RTSP_HPP
26 26
27 /* 27 /*
28 #include <srs_rtsp_stack.hpp> 28 #include <srs_rtsp_stack.hpp>