commit cb728e6f63e90405223e2a72f119967368f78b7a
author Josh Gao <jmgao@google.com> Thu Sep 15 13:56:37 2016 -0700
committer Josh Gao <jmgao@google.com> Thu Sep 15 14:21:28 2016 -0700
tree 2b43dfd6050c9858c98bc3428e4207b417274fc3
parent b36efa4343d79e3fb548d12d039193850246b892

Fix instances of '#if __i386__'.

Triggers -Wundef, which is on in -Weverything.

Bug: http://b/31496165
Change-Id: Ie2241b19abd6257bebf68baa3ecc4de8066c722e

libc/bionic/pthread_create.cpp

diff --git a/libc/bionic/pthread_create.cpp b/libc/bionic/pthread_create.cpp
index 7986ada..bfa4e8c 100644
--- a/libc/bionic/pthread_create.cpp
+++ b/libc/bionic/pthread_create.cpp
@@ -44,7 +44,7 @@
 #include "private/ScopedPthreadMutexLocker.h"
 
 // x86 uses segment descriptors rather than a direct pointer to TLS.
-#if __i386__
+#if defined(__i386__)
 #include <asm/ldt.h>
 void __init_user_desc(struct user_desc*, bool, void*);
 #endif

libc/include/sys/user.h

diff --git a/libc/include/sys/user.h b/libc/include/sys/user.h
index 5601b02..f9ad956 100644
--- a/libc/include/sys/user.h
+++ b/libc/include/sys/user.h
@@ -38,7 +38,7 @@
 #define PAGE_SIZE 4096
 #define PAGE_MASK (~(PAGE_SIZE - 1))
 
-#if __i386__
+#if defined(__i386__)
 
 struct user_fpregs_struct {
   long cwd;