Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
mediastreamer2
Commits
292e7943
Commit
292e7943
authored
Sep 20, 2010
by
Simon Morlat
Browse files
move definition of ms_time to the right place
parent
fd66bca4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
include/mediastreamer2/mediastream.h
include/mediastreamer2/mediastream.h
+2
-6
include/mediastreamer2/mscommon.h
include/mediastreamer2/mscommon.h
+7
-0
No files found.
include/mediastreamer2/mediastream.h
View file @
292e7943
...
...
@@ -28,13 +28,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "mediastreamer2/msvideo.h"
#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
{
ELInactive
,
...
...
include/mediastreamer2/mscommon.h
View file @
292e7943
...
...
@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define mscommon_h
#include <ortp/ortp.h>
#include <time.h>
#define ms_malloc ortp_malloc
#define ms_malloc0 ortp_malloc0
...
...
@@ -43,6 +44,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#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
static
inline
void
ms_debug
(
const
char
*
fmt
,...)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment