diff options
| author |  Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:04:43 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:13:09 +0300 |
| commit | 17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069 (patch) | |
| tree | 5d1910a2ab6381f6b4fb0ffc2834f55f7fef7129 /gui/wm/ws.h | |
| parent | 2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 (diff) | |
| parent | af76be6e197382af491fadef3fcf821a721c99f5 (diff) | |
Merge svn changes up to r27441
Conflicts:
cfg-common-opts.h
command.c
configure
input/input.c
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpdemux/stheader.h
libvo/sub.c
libvo/video_out.c
libvo/vo_xv.c
libvo/vosub_vidix.c
libvo/x11_common.c
libvo/x11_common.h
mp_core.h
mplayer.c
stream/stream.h
Diffstat (limited to 'gui/wm/ws.h')
| -rw-r--r-- | gui/wm/ws.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gui/wm/ws.h b/gui/wm/ws.h index e782edd6d3..73321c6ae9 100644 --- a/gui/wm/ws.h +++ b/gui/wm/ws.h @@ -27,7 +27,7 @@ #include <X11/keysym.h> #include <X11/Xatom.h> #include <X11/extensions/XShm.h> -#ifdef HAVE_XDPMS +#ifdef CONFIG_XDPMS #include <X11/extensions/dpms.h> #endif |