Changeset 1154:e89ef1c2f48e in mediastreamer2

Timestamp:

Sep 20, 2010 9:25:03 PM (3 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Message:

move definition of ms_time to the right place

Location:

include/mediastreamer2

Files:

• mediastream.h (modified) (1 diff)
• mscommon.h (modified) (2 diffs)

include/mediastreamer2/mediastream.h

@@ -29 +29 @@
 #include "ortp/ortp.h"
 #include "ortp/event.h"
-#include <time.h>
-
-#if defined(_WIN32_WCE)
-time_t ms_time (time_t *t);
-#else
-#define ms_time time
-#endif
+
+
+
 
 typedef enum EchoLimiterType{

include/mediastreamer2/mscommon.h

@@ -21 +21 @@
 
 #include <ortp/ortp.h>
+#include <time.h>
 
 #define ms_malloc       ortp_malloc
@@ -43 +44 @@
 #define ms_cond_broadcast       ortp_cond_broadcast
 #define ms_cond_destroy         ortp_cond_destroy
+
+#if defined(_WIN32_WCE)
+time_t ms_time (time_t *t);
+#else
+#define ms_time time
+#endif
 
 #ifdef WIN32