[rtmpdump] r310 - in trunk: librtmp/log.h librtmp/rtmp.h rtmpgw.c rtmpsrv.c rtmpsuck.c

[hyc]

Author: hyc
Date: Mon Mar  8 16:13:57 2010
New Revision: 310

Log:
Drop log.h from rtmp.h

Modified:
   trunk/librtmp/log.h
   trunk/librtmp/rtmp.h
   trunk/rtmpgw.c
   trunk/rtmpsrv.c
   trunk/rtmpsuck.c

Modified: trunk/librtmp/log.h
==============================================================================
--- trunk/librtmp/log.h	Mon Mar  8 15:41:31 2010	(r309)
+++ trunk/librtmp/log.h	Mon Mar  8 16:13:57 2010	(r310)
@@ -30,7 +30,6 @@ extern "C" {
 #endif
 /* Enable this to get full debugging output */
 /* #define _DEBUG */
-#define CRYPTO
 
 #ifdef _DEBUG
 #undef NODEBUG

Modified: trunk/librtmp/rtmp.h
==============================================================================
--- trunk/librtmp/rtmp.h	Mon Mar  8 15:41:31 2010	(r309)
+++ trunk/librtmp/rtmp.h	Mon Mar  8 16:13:57 2010	(r310)
@@ -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

Modified: trunk/rtmpgw.c
==============================================================================
--- trunk/rtmpgw.c	Mon Mar  8 15:41:31 2010	(r309)
+++ trunk/rtmpgw.c	Mon Mar  8 16:13:57 2010	(r310)
@@ -29,6 +29,7 @@
 #include <assert.h>
 
 #include "librtmp/rtmp.h"
+#include "librtmp/log.h"
 
 #include "thread.h"
 

Modified: trunk/rtmpsrv.c
==============================================================================
--- trunk/rtmpsrv.c	Mon Mar  8 15:41:31 2010	(r309)
+++ trunk/rtmpsrv.c	Mon Mar  8 16:13:57 2010	(r310)
@@ -34,7 +34,7 @@
 #include <assert.h>
 
 #include "librtmp/rtmp.h"
-#include "parseurl.h"
+#include "librtmp/log.h"
 
 #include "thread.h"
 

Modified: trunk/rtmpsuck.c
==============================================================================
--- trunk/rtmpsuck.c	Mon Mar  8 15:41:31 2010	(r309)
+++ trunk/rtmpsuck.c	Mon Mar  8 16:13:57 2010	(r310)
@@ -34,7 +34,7 @@
 #include <assert.h>
 
 #include "librtmp/rtmp.h"
-#include "parseurl.h"
+#include "librtmp/log.h"
 
 #include "thread.h"