diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-07-25 19:33:28 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-07-25 19:33:28 +0100 |
| commit | 63f22638336754eb9029722859aada83f094f393 (patch) | |
| tree | 5aeedf316a6cd999ecf26a596b2e708bae1aec15 /hw/kdrive/ephyr/XF86dri.c | |
| parent | 14509db233c248e91addc1d6b1fd46d1b2198a12 (diff) | |
| parent | 2ce434f54bc0d6050ef115e310df62c035e84bf2 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2
Diffstat (limited to 'hw/kdrive/ephyr/XF86dri.c')
| -rw-r--r-- | hw/kdrive/ephyr/XF86dri.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/hw/kdrive/ephyr/XF86dri.c b/hw/kdrive/ephyr/XF86dri.c index be65edf5b..31f796331 100644 --- a/hw/kdrive/ephyr/XF86dri.c +++ b/hw/kdrive/ephyr/XF86dri.c @@ -45,6 +45,16 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifdef HAVE_CONFIG_H #include <kdrive-config.h> #endif +/* + * including some server headers (like kdrive-config.h) + * might define the macro _XSERVER64 + * on 64 bits machines. That macro must _NOT_ be defined for Xlib + * client code, otherwise bad things happen. + * So let's undef that macro if necessary. + */ +#ifdef _XSERVER64 +#undef _XSERVER64 +#endif /* THIS IS NOT AN X CONSORTIUM STANDARD */ |