diff options
| author | marha <marha@users.sourceforge.net> | 2014-06-08 15:05:49 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-06-08 15:05:49 +0200 |
| commit | 71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec (patch) | |
| tree | ea689cdd51f395980ddc37dc33781635976f3a16 /xorg-server/hw/xfree86/common/compiler.h | |
| parent | aec798fb4dc72d616732d0fa711faffaa8cd7590 (diff) | |
| parent | 2acb86c9b086bdb9a3897db0b93820652e07cb59 (diff) | |
| download | vcxsrv-71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec.tar.gz vcxsrv-71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec.tar.bz2 vcxsrv-71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
apps/xwininfo/xwininfo.c
xorg-server/hw/xwin/glx/indirect.c
Diffstat (limited to 'xorg-server/hw/xfree86/common/compiler.h')
| -rw-r--r-- | xorg-server/hw/xfree86/common/compiler.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/common/compiler.h b/xorg-server/hw/xfree86/common/compiler.h index 15e1ca234..a44afacde 100644 --- a/xorg-server/hw/xfree86/common/compiler.h +++ b/xorg-server/hw/xfree86/common/compiler.h @@ -1352,7 +1352,10 @@ stl_u(unsigned long val, unsigned int *p) #else /* ix86 */ #if !defined(__SUNPRO_C) -#if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__) && !defined(__aarch64__) && !defined(__arc__) +#if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && \ + !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && \ + !defined(__m32r__) && !defined(__aarch64__) && !defined(__arc__) && \ + !defined(__xtensa__) #ifdef GCCUSESGAS /* |