diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-30 11:11:16 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-30 11:11:16 +0200 |
| commit | 0f0386d4e90cb0769eddc04b18742d5a9a72ea05 (patch) | |
| tree | a8a5fb11e78c4afe6637c5adfa0d2224208f7314 /xorg-server/Xext | |
| parent | cd27f58626705bcb561115b8e5b0d1430df83fa6 (diff) | |
| parent | 762b7fde3d57d3a151f98535fd31516b7e823bc0 (diff) | |
| download | vcxsrv-0f0386d4e90cb0769eddc04b18742d5a9a72ea05.tar.gz vcxsrv-0f0386d4e90cb0769eddc04b18742d5a9a72ea05.tar.bz2 vcxsrv-0f0386d4e90cb0769eddc04b18742d5a9a72ea05.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-mmx.c
xorg-server/glx/glapi_gentable.c
Diffstat (limited to 'xorg-server/Xext')
| -rw-r--r-- | xorg-server/Xext/xres.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/xorg-server/Xext/xres.c b/xorg-server/Xext/xres.c index 7b2e609bd..a390227b0 100644 --- a/xorg-server/Xext/xres.c +++ b/xorg-server/Xext/xres.c @@ -29,7 +29,10 @@ #include <string.h> #include "hashtable.h" #include "picturestr.h" + +#ifdef COMPOSITE #include "compint.h" +#endif /** @brief Holds fragments of responses for ConstructClientIds. * |