From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532>
Date: Mon, 8 Mar 2010 15:13:57 +0000 (+0000)
Subject: Drop log.h from rtmp.h
X-Git-Tag: v2.4~225
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36b7207877d00fe97741593aeafba3d7334e41da;p=rtmpdump

Drop log.h from rtmp.h


git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@310 400ebc74-4327-4243-bc38-086b20814532
---

diff --git a/librtmp/log.h b/librtmp/log.h
index db8dbf3..8c635b2 100644
--- a/librtmp/log.h
+++ b/librtmp/log.h
@@ -30,7 +30,6 @@ extern "C" {
 #endif
 /* Enable this to get full debugging output */
 /* #define _DEBUG */
-#define CRYPTO
 
 #ifdef _DEBUG
 #undef NODEBUG
diff --git a/librtmp/rtmp.h b/librtmp/rtmp.h
index 32e7d55..88ef291 100644
--- a/librtmp/rtmp.h
+++ b/librtmp/rtmp.h
@@ -24,6 +24,8 @@
  *  http://www.gnu.org/copyleft/lgpl.html
  */
 
+#define CRYPTO
+
 #ifdef WIN32
 #include <winsock.h>
 #define GetSockError()	WSAGetLastError()
@@ -51,7 +53,6 @@
 #include <errno.h>
 #include <stdint.h>
 
-#include "log.h"
 #include "amf.h"
 
 #ifdef __cplusplus
diff --git a/rtmpgw.c b/rtmpgw.c
index f7847f1..e8b16c7 100644
--- a/rtmpgw.c
+++ b/rtmpgw.c
@@ -29,6 +29,7 @@
 #include <assert.h>
 
 #include "librtmp/rtmp.h"
+#include "librtmp/log.h"
 
 #include "thread.h"
 
diff --git a/rtmpsrv.c b/rtmpsrv.c
index a74a23b..565871e 100644
--- a/rtmpsrv.c
+++ b/rtmpsrv.c
@@ -34,7 +34,7 @@
 #include <assert.h>
 
 #include "librtmp/rtmp.h"
-#include "parseurl.h"
+#include "librtmp/log.h"
 
 #include "thread.h"
 
diff --git a/rtmpsuck.c b/rtmpsuck.c
index 60f3c72..8cbc36c 100644
--- a/rtmpsuck.c
+++ b/rtmpsuck.c
@@ -34,7 +34,7 @@
 #include <assert.h>
 
 #include "librtmp/rtmp.h"
-#include "parseurl.h"
+#include "librtmp/log.h"
 
 #include "thread.h"