This was overwritten by mistake. Backported to revision 15898.

diff --git a/bindings/java/vlc-graphics-jni.cc b/bindings/java/vlc-graphics-jni.cc
index 0e843f7f9c69001b6245da0f99498767e8ca27c0..2a5fa0d9a0e860f0065b6379839ddbaf4545be0b 100644 (file)
--- a/bindings/java/vlc-graphics-jni.cc
+++ b/bindings/java/vlc-graphics-jni.cc
@@ -26,7 +26,10 @@
 #include <jawt.h>
 #include <jawt_md.h>
 
+#ifndef WIN32
 #include <X11/Xlib.h> // for Xlibs graphics functions
+#endif
+
 #include <stdio.h>    // for printf
 
 /* JVLC internal imports, generated by gcjh */
@@ -41,10 +44,14 @@ JNIEXPORT void JNICALL Java_org_videolan_jvlc_JVLCCanvas_paint (JNIEnv *env, job
   JAWT awt;
   JAWT_DrawingSurface* ds;
   JAWT_DrawingSurfaceInfo* dsi;
+#ifdef WIN32
+  JAWT_Win32DrawingSurfaceInfo* dsi_win;
+#else
   JAWT_X11DrawingSurfaceInfo* dsi_x11;
-
-  jint lock;
   GC gc;
+#endif
+  
+  jint lock;
     
   vlc_value_t value;