[xiph-commits] r3041 - liboggplay/trunk/src/liboggplay

[laser13 at svn.annodex.net]

Author: laser13
Date: 2007-06-24 21:00:11 -0700 (Sun, 24 Jun 2007)
New Revision: 3041

Modified:
   liboggplay/trunk/src/liboggplay/oggplay_private.h
Log:
On Win32 windows.h has to be included last. Change required by adding wrappers for semaphore operations.

Modified: liboggplay/trunk/src/liboggplay/oggplay_private.h
===================================================================
--- liboggplay/trunk/src/liboggplay/oggplay_private.h	2007-06-25 03:51:27 UTC (rev 3040)
+++ liboggplay/trunk/src/liboggplay/oggplay_private.h	2007-06-25 04:00:11 UTC (rev 3041)
@@ -45,6 +45,16 @@
 #include <theora/theora.h>
 #include <fishsound/fishsound.h>
 
+#ifdef WIN32
+#include "config_win32.h"
+#ifdef HAVE_WINSOCK2
+#include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
+#endif
+
+// for Win32 <windows.h> has to be included last
 #include "std_semaphore.h"
 
 /**
@@ -243,13 +253,4 @@
     _calloc(n, s))
 #endif
 
-#ifdef _WIN32
-#include "config_win32.h"
-#ifdef HAVE_WINSOCK2
-#include <winsock2.h>
-#else
-#include <winsock.h>
 #endif
-#endif
-
-#endif