diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-10-17 15:00:54 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-10-17 15:00:54 -0400 |
| commit | c3f7b862550fa8f46633162f83db8c27e46fc672 (patch) | |
| tree | a8427c93c96af2bbf2133b07f2510ff31560e54d /os/xalloc.c | |
| parent | af4dde0ac19ecec1d0ad988eb25b15401e7c6b36 (diff) | |
| parent | feac0759522cbdc3e61ccfa373df735903c5cb27 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
os/access.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*/ ); \ |