Mercurial > libdvdnav.hg

changeset 239:eaa775ba1306 src

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge the two #ifdef blocks that both check for WIN32 to improve readability
author mroi
date Fri, 13 Feb 2004 19:16:17 +0000
parents 70a34f697a50
children 585e0f683973
files dvdnav_internal.h
diffstat 1 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/dvdnav_internal.h	Fri Feb 13 19:15:30 2004 +0000
+++ b/dvdnav_internal.h	Fri Feb 13 19:16:17 2004 +0000
@@ -35,6 +35,7 @@
 #include <string.h>
 
 #ifdef WIN32
+
 /* pthread_mutex_* wrapper for win32 */
 #include <windows.h>
 #include <process.h>
@@ -43,12 +44,7 @@
 #define pthread_mutex_lock(a)    EnterCriticalSection(a)
 #define pthread_mutex_unlock(a)  LeaveCriticalSection(a)
 #define pthread_mutex_destroy(a)
-#else
-#include <pthread.h>
-#endif
 
-/* misc win32 helpers */
-#ifdef WIN32
 /* replacement gettimeofday implementation */
 #include <sys/timeb.h>
 static inline int gettimeofday( struct timeval *tv, void *tz )
@@ -61,7 +57,12 @@
 }
 #include <io.h> /* read() */
 #define lseek64 _lseeki64
-#endif
+
+#else
+
+#include <pthread.h>
+
+#endif /* WIN32 */
 
 /* Uncomment for VM command tracing */
 /* #define TRACE */