[Mplayer-cvslog] CVS: main/libvo vo_x11.c,1.136,1.137

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/tmp/cvs-serv20595

Modified Files:
	vo_x11.c 
Log Message:
just the same include reordering as in vo_xv (codemetics :)

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- vo_x11.c	30 Nov 2003 16:36:10 -0000	1.136
+++ vo_x11.c	27 Dec 2003 19:45:54 -0000	1.137
@@ -19,6 +19,21 @@
 
 #include "x11_common.h"
 
+#ifdef HAVE_SHM
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <X11/extensions/XShm.h>
+
+static int Shmem_Flag;
+//static int Quiet_Flag;  Here also what is this for. It's used but isn't inited ?
+static XShmSegmentInfo Shminfo[1];
+static int gXErrorFlag;
+static int CompletionType=-1;
+
+/* since it doesn't seem to be defined on some platforms */
+int XShmGetEventBase( Display* );
+#endif
+
 #include "fastmemcpy.h"
 #include "sub.h"
 
@@ -61,20 +76,6 @@
 static int Flip_Flag;
 static int zoomFlag;
 
-#ifdef HAVE_SHM
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <X11/extensions/XShm.h>
-
-static int Shmem_Flag;
-//static int Quiet_Flag;  Here also what is this for. It's used but isn't inited ?
-static XShmSegmentInfo Shminfo[1];
-static int gXErrorFlag;
-static int CompletionType=-1;
-
-/* since it doesn't seem to be defined on some platforms */
-int XShmGetEventBase( Display* );
-#endif
 
 static uint32_t image_width;
 static uint32_t image_height;
@@ -672,4 +673,3 @@
   }
   return VO_NOTIMPL;
 }
-