Mercurial > mplayer.hg
changeset 11690:860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
| author | alex |
|---|---|
| date | Sat, 27 Dec 2003 19:45:54 +0000 |
| parents | 2b1649aaaf2a |
| children | 30c8b8be44e1 |
| files | libvo/vo_x11.c |
| diffstat | 1 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- 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 <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; } -