From a5bd70e04fe3ec2089a2ec6930f165a43c68904b Mon Sep 17 00:00:00 2001 From: alex Date: Sat, 27 Dec 2003 19:45:54 +0000 Subject: just the same include reordering as in vo_xv (codemetics :) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11691 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_x11.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 6203f783d7..ccf6434256 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -19,6 +19,21 @@ #include "x11_common.h" +#ifdef HAVE_SHM +#include +#include +#include + +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 int_pause; static int Flip_Flag; static int zoomFlag; -#ifdef HAVE_SHM -#include -#include -#include - -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 @@ static uint32_t control(uint32_t request, void *data, ...) } return VO_NOTIMPL; } - -- cgit v1.2.3