diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-15 08:22:54 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-15 08:22:54 +0100 |
| commit | 0b2fa092281e667dbb02942008b16510af1086ef (patch) | |
| tree | 350352f14a2a6f98d2f5a5356eb63aeae67d6047 /xorg-server/hw | |
| parent | 1de47a7fc53a67beccab830178aaa0118ed4734f (diff) | |
| parent | 6f6a2340d40759b77ef43965efdd24f3e4e623fd (diff) | |
| download | vcxsrv-0b2fa092281e667dbb02942008b16510af1086ef.tar.gz vcxsrv-0b2fa092281e667dbb02942008b16510af1086ef.tar.bz2 vcxsrv-0b2fa092281e667dbb02942008b16510af1086ef.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxcb mesa xserver xkeyboard-config git update 15 Feb 2013
Diffstat (limited to 'xorg-server/hw')
| -rw-r--r-- | xorg-server/hw/xquartz/GL/capabilities.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xorg-server/hw/xquartz/GL/capabilities.c b/xorg-server/hw/xquartz/GL/capabilities.c index 4702595f4..5573629fd 100644 --- a/xorg-server/hw/xquartz/GL/capabilities.c +++ b/xorg-server/hw/xquartz/GL/capabilities.c @@ -20,6 +20,10 @@ * DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <stdlib.h> #include <assert.h> |