From 5bbb76a59d51e2fbffa5f80756edf75839278ad7 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Tue, 1 Apr 2014 17:30:55 +0800
Subject: [PATCH] remove the namespace srs, use http prefix

---
 trunk/src/app/srs_app_http.cpp |  2 --
 trunk/src/app/srs_app_http.hpp | 31 ++++++++++++++-----------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/trunk/src/app/srs_app_http.cpp b/trunk/src/app/srs_app_http.cpp
index 40244b0fe..d990460b5 100644
--- a/trunk/src/app/srs_app_http.cpp
+++ b/trunk/src/app/srs_app_http.cpp
@@ -38,8 +38,6 @@ using namespace std;
 #include <srs_kernel_log.hpp>
 #include <srs_app_socket.hpp>
 
-using namespace srs;
-
 #define SRS_DEFAULT_HTTP_PORT 80
 #define SRS_HTTP_RESPONSE_OK "0"
 
diff --git a/trunk/src/app/srs_app_http.hpp b/trunk/src/app/srs_app_http.hpp
index b271ae0f2..8e0f19ffd 100644
--- a/trunk/src/app/srs_app_http.hpp
+++ b/trunk/src/app/srs_app_http.hpp
@@ -34,23 +34,20 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifdef SRS_HTTP_PARSER
 
 // http specification
-namespace srs
-{
-    // CR             = <US-ASCII CR, carriage return (13)>
-    #define __CR "\r" // 0x0D
-    // LF             = <US-ASCII LF, linefeed (10)>
-    #define __LF "\n" // 0x0A
-    // SP             = <US-ASCII SP, space (32)>
-    #define __SP " " // 0x20
-    // HT             = <US-ASCII HT, horizontal-tab (9)>
-    #define __HT "\x09" // 0x09
-
-    // HTTP/1.1 defines the sequence CR LF as the end-of-line marker for all
-    // protocol elements except the entity-body (see appendix 19.3 for
-    // tolerant applications). 
-    #define __CRLF "\r\n" // 0x0D0A
-    #define __CRLFCRLF "\r\n\r\n" // 0x0D0A0D0A
-};
+// CR             = <US-ASCII CR, carriage return (13)>
+#define __CR "\r" // 0x0D
+// LF             = <US-ASCII LF, linefeed (10)>
+#define __LF "\n" // 0x0A
+// SP             = <US-ASCII SP, space (32)>
+#define __SP " " // 0x20
+// HT             = <US-ASCII HT, horizontal-tab (9)>
+#define __HT "\x09" // 0x09
+
+// HTTP/1.1 defines the sequence CR LF as the end-of-line marker for all
+// protocol elements except the entity-body (see appendix 19.3 for
+// tolerant applications). 
+#define __CRLF "\r\n" // 0x0D0A
+#define __CRLFCRLF "\r\n\r\n" // 0x0D0A0D0A
 
 #endif