diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-20 17:39:30 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-20 17:39:30 +0200 |
| commit | ae228baa2cfe88bd7c7de40d5038ad2cc1ecffa4 (patch) | |
| tree | b18ae337e913f36a95f97530f6a792e9366a393c /xorg-server/hw/xfree86/modes/xf86Crtc.c | |
| parent | 4207bc7b2972aed9a45756fae8c48957d323fa21 (diff) | |
| parent | 0e3699334faf92f508b6c187a261548b656b0dd3 (diff) | |
| download | vcxsrv-ae228baa2cfe88bd7c7de40d5038ad2cc1ecffa4.tar.gz vcxsrv-ae228baa2cfe88bd7c7de40d5038ad2cc1ecffa4.tar.bz2 vcxsrv-ae228baa2cfe88bd7c7de40d5038ad2cc1ecffa4.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/dix/resource.c
Diffstat (limited to 'xorg-server/hw/xfree86/modes/xf86Crtc.c')
| -rw-r--r-- | xorg-server/hw/xfree86/modes/xf86Crtc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c index 6d5e92f12..fee1ae774 100644 --- a/xorg-server/hw/xfree86/modes/xf86Crtc.c +++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c @@ -44,7 +44,9 @@ #include "X11/Xatom.h" #include "picturestr.h" +#ifdef XV #include "xf86xv.h" +#endif #define NO_OUTPUT_DEFAULT_WIDTH 1024 #define NO_OUTPUT_DEFAULT_HEIGHT 768 |