commit f21ca653b7407f22b679ebf2877b7d8c5b719167
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jun 03 19:29:12 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 03 19:29:12 2016 +0000
tree 1165f6de3ae0cd0a0313d51535d5e4699194c0f1
parent e7d75a5d43b036171e180c26a3da1072f7c706d9
parent 8ba4424a4160d56c520342e946988ab60d31f95a

Merge "Fix __errordecl on clang."

libc/libc.arm.brillo.map

diff --git a/libc/libc.arm.brillo.map b/libc/libc.arm.brillo.map
index 6998cab..7833d05 100644
--- a/libc/libc.arm.brillo.map
+++ b/libc/libc.arm.brillo.map
@@ -9,7 +9,6 @@
     __atomic_swap; # arm
     __b64_ntop;
     __b64_pton;
-    __brk; # arm x86 mips
     __cmsg_nxthdr;
     __connect; # arm x86 mips
     __ctype_get_mb_cur_max;

libc/libc.arm.map

diff --git a/libc/libc.arm.map b/libc/libc.arm.map
index 8628ed1..a1b2511 100644
--- a/libc/libc.arm.map
+++ b/libc/libc.arm.map
@@ -9,7 +9,6 @@
     __atomic_swap; # arm
     __b64_ntop;
     __b64_pton;
-    __brk; # arm x86 mips
     __cmsg_nxthdr;
     __connect; # arm x86 mips
     __ctype_get_mb_cur_max;

libc/libc.map.txt

diff --git a/libc/libc.map.txt b/libc/libc.map.txt
index 1ed2977..d893b8b 100644
--- a/libc/libc.map.txt
+++ b/libc/libc.map.txt
@@ -8,7 +8,6 @@
     __atomic_swap; # arm
     __b64_ntop;
     __b64_pton;
-    __brk; # arm x86 mips
     __cmsg_nxthdr;
     __connect; # arm x86 mips
     __ctype_get_mb_cur_max;

libc/libc.mips.brillo.map

diff --git a/libc/libc.mips.brillo.map b/libc/libc.mips.brillo.map
index f42f5aa..56d4727 100644
--- a/libc/libc.mips.brillo.map
+++ b/libc/libc.mips.brillo.map
@@ -5,7 +5,6 @@
     __assert2;
     __b64_ntop;
     __b64_pton;
-    __brk; # arm x86 mips
     __cmsg_nxthdr;
     __connect; # arm x86 mips
     __ctype_get_mb_cur_max;

libc/libc.mips.map

diff --git a/libc/libc.mips.map b/libc/libc.mips.map
index 439c855..35c56cb 100644
--- a/libc/libc.mips.map
+++ b/libc/libc.mips.map
@@ -5,7 +5,6 @@
     __assert2;
     __b64_ntop;
     __b64_pton;
-    __brk; # arm x86 mips
     __cmsg_nxthdr;
     __connect; # arm x86 mips
     __ctype_get_mb_cur_max;

libc/libc.x86.brillo.map

diff --git a/libc/libc.x86.brillo.map b/libc/libc.x86.brillo.map
index b1ba988..a58d2bc 100644
--- a/libc/libc.x86.brillo.map
+++ b/libc/libc.x86.brillo.map
@@ -5,7 +5,6 @@
     __assert2;
     __b64_ntop;
     __b64_pton;
-    __brk; # arm x86 mips
     __cmsg_nxthdr;
     __connect; # arm x86 mips
     __ctype_get_mb_cur_max;

libc/libc.x86.map

diff --git a/libc/libc.x86.map b/libc/libc.x86.map
index bab1737..2fe730f 100644
--- a/libc/libc.x86.map
+++ b/libc/libc.x86.map
@@ -5,7 +5,6 @@
     __assert2;
     __b64_ntop;
     __b64_pton;
-    __brk; # arm x86 mips
     __cmsg_nxthdr;
     __connect; # arm x86 mips
     __ctype_get_mb_cur_max;

tests/dlext_test.cpp

diff --git a/tests/dlext_test.cpp b/tests/dlext_test.cpp
index f8a7ccd..a0e83fe 100644
--- a/tests/dlext_test.cpp
+++ b/tests/dlext_test.cpp
@@ -37,7 +37,7 @@
 #include "dlext_private.h"
 
 #define ASSERT_DL_NOTNULL(ptr) \
-    ASSERT_TRUE(ptr != nullptr) << "dlerror: " << dlerror()
+    ASSERT_TRUE((ptr) != nullptr) << "dlerror: " << dlerror()
 
 #define ASSERT_DL_ZERO(i) \
     ASSERT_EQ(0, i) << "dlerror: " << dlerror()
@@ -52,7 +52,7 @@
 typedef int (*fn)(void);
 #define LIBNAME "libdlext_test.so"
 #define LIBNAME_NORELRO "libdlext_test_norelro.so"
-#define LIBSIZE 1024*1024 // how much address space to reserve for it
+constexpr auto LIBSIZE = 1024 * 1024; // how much address space to reserve for it
 
 #if defined(__LP64__)
 #define NATIVE_TESTS_PATH "/nativetest64"

tests/string_test.cpp

diff --git a/tests/string_test.cpp b/tests/string_test.cpp
index 2a9da10..763d65c 100644
--- a/tests/string_test.cpp
+++ b/tests/string_test.cpp
@@ -40,10 +40,10 @@
 #define STRLCAT_SUPPORTED
 #endif
 
-#define KB 1024
-#define SMALL 1*KB
-#define MEDIUM 4*KB
-#define LARGE 64*KB
+constexpr auto KB = 1024;
+constexpr auto SMALL = 1 * KB;
+constexpr auto MEDIUM = 4 * KB;
+constexpr auto LARGE = 64 * KB;
 
 static int signum(int i) {
   if (i < 0) {

tests/wchar_test.cpp

diff --git a/tests/wchar_test.cpp b/tests/wchar_test.cpp
index e86d56d..000dc98 100644
--- a/tests/wchar_test.cpp
+++ b/tests/wchar_test.cpp
@@ -22,7 +22,7 @@
 #include <stdint.h>
 #include <wchar.h>
 
-#define NUM_WCHARS(num_bytes) (num_bytes/sizeof(wchar_t))
+#define NUM_WCHARS(num_bytes) ((num_bytes)/sizeof(wchar_t))
 
 TEST(wchar, sizeof_wchar_t) {
   EXPECT_EQ(4U, sizeof(wchar_t));