# HG changeset patch # User alex # Date 1072554354 0 # Node ID 860bc06f32ca95f667b080d1e50afd8098600e1e # Parent 2b1649aaaf2a28e69092fdfc19c727c87b5923a9 just the same include reordering as in vo_xv (codemetics :) diff -r 2b1649aaaf2a -r 860bc06f32ca libvo/vo_x11.c --- a/libvo/vo_x11.c Sat Dec 27 19:27:59 2003 +0000 +++ b/libvo/vo_x11.c Sat Dec 27 19:45:54 2003 +0000 @@ -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 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 @@ } return VO_NOTIMPL; } -