commit b36efa4343d79e3fb548d12d039193850246b892
author Josh Gao <jmgao@google.com> Thu Sep 15 13:55:41 2016 -0700
committer Josh Gao <jmgao@google.com> Thu Sep 15 14:21:28 2016 -0700
tree 727ac48a5341d8d50d6a297fe67f6067005befd3
parent 56228373014e5ee0a3ff32930df9cfa05fef7389

Fix instances of '#if __LP64__'.

Triggers -Wundef, which is on in -Weverything.

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

tests/libc_logging_test.cpp

diff --git a/tests/libc_logging_test.cpp b/tests/libc_logging_test.cpp
index d4ceded..4150483 100644
--- a/tests/libc_logging_test.cpp
+++ b/tests/libc_logging_test.cpp
@@ -133,7 +133,7 @@
 #if defined(__BIONIC__)
   char buf[BUFSIZ];
   __libc_format_buffer(buf, sizeof(buf), "%ld", LONG_MAX);
-#if __LP64__
+#if defined(__LP64__)
   EXPECT_STREQ("9223372036854775807", buf);
 #else
   EXPECT_STREQ("2147483647", buf);
@@ -147,7 +147,7 @@
 #if defined(__BIONIC__)
   char buf[BUFSIZ];
   __libc_format_buffer(buf, sizeof(buf), "%ld", LONG_MIN);
-#if __LP64__
+#if defined(__LP64__)
   EXPECT_STREQ("-9223372036854775808", buf);
 #else
   EXPECT_STREQ("-2147483648", buf);

tests/stdio_test.cpp

diff --git a/tests/stdio_test.cpp b/tests/stdio_test.cpp
index 79c5e92..63da9e0 100644
--- a/tests/stdio_test.cpp
+++ b/tests/stdio_test.cpp
@@ -548,7 +548,7 @@
 TEST(STDIO_TEST, snprintf_ld_LONG_MAX) {
   char buf[BUFSIZ];
   snprintf(buf, sizeof(buf), "%ld", LONG_MAX);
-#if __LP64__
+#if defined(__LP64__)
   EXPECT_STREQ("9223372036854775807", buf);
 #else
   EXPECT_STREQ("2147483647", buf);
@@ -558,7 +558,7 @@
 TEST(STDIO_TEST, snprintf_ld_LONG_MIN) {
   char buf[BUFSIZ];
   snprintf(buf, sizeof(buf), "%ld", LONG_MIN);
-#if __LP64__
+#if defined(__LP64__)
   EXPECT_STREQ("-9223372036854775808", buf);
 #else
   EXPECT_STREQ("-2147483648", buf);

tests/sys_ptrace_test.cpp

diff --git a/tests/sys_ptrace_test.cpp b/tests/sys_ptrace_test.cpp
index 9071acf..bdd6a89 100644
--- a/tests/sys_ptrace_test.cpp
+++ b/tests/sys_ptrace_test.cpp
@@ -183,7 +183,7 @@
   run_watchpoint_test_impl<uint8_t>(cpu);
   run_watchpoint_test_impl<uint16_t>(cpu);
   run_watchpoint_test_impl<uint32_t>(cpu);
-#if __LP64__
+#if defined(__LP64__)
   run_watchpoint_test_impl<uint64_t>(cpu);
 #endif
 }