diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2012-04-19 16:51:46 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2012-04-23 20:16:53 -0700 |
| commit | 0ba1794fe2896395875f62e911720c7585687444 (patch) | |
| tree | 32d92a8771408a7ffd7144979353c93d7be1fd05 | |
| parent | d77eb7ee49ef19c2c4c7381d56e9d0f9c3fbc890 (diff) | |
xres: Fix build without composite
Regression from: b8d0d19a6d410776b53a41e7cae90f68d4b22bb7
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Tested-By: Michal Suchanek <hramrach@gmail.com>
| -rw-r--r-- | Xext/xres.c | 3 | ||||
| -rwxr-xr-x | hw/xfree86/sdksyms.sh | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Xext/xres.c b/Xext/xres.c index ecef0c032..dbefeebdb 100644 --- a/Xext/xres.c +++ b/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. * diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh index 3815525fa..f6c3f2244 100755 --- a/hw/xfree86/sdksyms.sh +++ b/hw/xfree86/sdksyms.sh @@ -251,8 +251,9 @@ cat > sdksyms.c << EOF #include "exa.h" */ - +#ifdef COMPOSITE #include "compositeext.h" +#endif /* xfixes/Makefile.am */ #include "xfixes.h" |