Fixed compliation error due to inclusion of threads.h

[vlc] / src / misc / mtime.c

diff --git a/src/misc/mtime.c b/src/misc/mtime.c
index 1f70fbd1b4357e057f218bd3877aa4e3b98c2e96..140752c925626f7d4a30e893047f0403dfe8e2a6 100644 (file)
--- a/src/misc/mtime.c
+++ b/src/misc/mtime.c
@@ -2,8 +2,8 @@
  * mtime.c: high rezolution time management functions
  * Functions are prototyped in mtime.h.
  *****************************************************************************
- * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: mtime.c,v 1.24 2001/06/28 22:12:04 gbazin Exp $
+ * Copyright (C) 1998-2001 VideoLAN
+ * $Id: mtime.c,v 1.27 2001/12/30 07:09:56 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -30,10 +30,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include "defs.h"
-
 #include <stdio.h>                                              /* sprintf() */
 
+#include <videolan/vlc.h>
+
 #if defined( PTH_INIT_IN_PTH_H )                                  /* GNU Pth */
 #   include <pth.h>
 #endif
@@ -52,10 +52,6 @@
 #   include <sys/time.h>
 #endif
 
-#include "config.h"
-#include "common.h"
-#include "mtime.h"
-
 /*****************************************************************************
  * mstrtime: return a date in a readable format
  *****************************************************************************
@@ -97,11 +93,9 @@ mtime_t mdate( void )
         QueryPerformanceCounter( (LARGE_INTEGER *)&usec_time );
         return ( usec_time * 1000000 ) / freq;
     }
-    else
-    {
-        /* Milisecond resolution */
-        return 1000 * GetTickCount();
-    }
+
+    /* Milisecond resolution */
+    return 1000 * GetTickCount();
 
 #else
     struct timeval tv_date;