diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-11-07 15:37:23 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-11-07 15:37:23 +1030 |
| commit | 0b729051c04da7068f1e6dd319190bd0a362b2c0 (patch) | |
| tree | 6e15c5de67a40d04167fcf0a2e0e26af8eca11c2 /os/xalloc.c | |
| parent | b7ee005d327372c1e414ee6c526f9f7aee14bc86 (diff) | |
| parent | d7c5e8bfc1aecbd23a4cbb2eab08656587aac2e8 (diff) | |
Merge branch 'master' into mpx
Conflicts:
Xi/extinit.c
Xi/grabdev.c
Xi/setmode.c
Xi/ungrdev.c
dix/devices.c
dix/events.c
dix/getevents.c
include/dix.h
mi/midispcur.c
mi/misprite.c
xkb/xkbActions.c
xkb/xkbEvents.c
xkb/xkbPrKeyEv.c
Diffstat (limited to 'os/xalloc.c')
| -rw-r--r-- | os/xalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/os/xalloc.c b/os/xalloc.c index 8c019f3bc..e5f39465b 100644 --- a/os/xalloc.c +++ b/os/xalloc.c @@ -211,7 +211,7 @@ extern Bool Must_have_memory; fclose(f); \ } \ } -#if defined(linux) && defined(i386) +#if defined(linux) && defined(__i386__) #define LOG_ALLOC(_fun, _size, _ret) \ { unsigned long *from; \ __asm__("movl %%ebp,%0" : /*OUT*/ "=r" (from) : /*IN*/ ); \ |