<p dir="ltr">LGTM iff the tests pass.</p>
<div class="gmail_quote">On Nov 15, 2013 11:18 PM, "Bob Wilson" <<a href="mailto:bob.wilson@apple.com">bob.wilson@apple.com</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: bwilson<br>
Date: Fri Nov 15 13:13:08 2013<br>
New Revision: 194841<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=194841&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=194841&view=rev</a><br>
Log:<br>
Remove #include of net/ip_mroute.h for SANITIZER_MAC.<br>
<br>
This header has not been supported at all for the last 2 major OS X releases.<br>
Removed its include and the capture of related symbols.<br>
<br>
<rdar://problem/15303348><br>
<br>
Modified:<br>
compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc<br>
compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc<br>
compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc?rev=194841&r1=194840&r2=194841&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc?rev=194841&r1=194840&r2=194841&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc Fri Nov 15 13:13:08 2013<br>
@@ -88,7 +88,7 @@ static void ioctl_table_fill() {<br>
_(TIOCSTI, READ, sizeof(char));<br>
_(TIOCSWINSZ, READ, struct_winsize_sz);<br>
<br>
-#if (SANITIZER_LINUX && !SANITIZER_ANDROID) || SANITIZER_MAC<br>
+#if (SANITIZER_LINUX && !SANITIZER_ANDROID)<br>
_(SIOCGETSGCNT, WRITE, struct_sioc_sg_req_sz);<br>
_(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);<br>
#endif<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc?rev=194841&r1=194840&r2=194841&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc?rev=194841&r1=194840&r2=194841&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc Fri Nov 15 13:13:08 2013<br>
@@ -114,7 +114,6 @@<br>
<br>
#if SANITIZER_MAC<br>
#include <net/ethernet.h><br>
-#include <netinet/ip_mroute.h><br>
#include <sys/filio.h><br>
#include <sys/mount.h><br>
#include <sys/sockio.h><br>
@@ -325,7 +324,7 @@ namespace __sanitizer {<br>
unsigned struct_unimapinit_sz = sizeof(struct unimapinit);<br>
#endif<br>
<br>
-#if !SANITIZER_ANDROID<br>
+#if !SANITIZER_ANDROID && !SANITIZER_MAC<br>
unsigned struct_sioc_sg_req_sz = sizeof(struct sioc_sg_req);<br>
unsigned struct_sioc_vif_req_sz = sizeof(struct sioc_vif_req);<br>
#endif<br>
@@ -376,7 +375,7 @@ namespace __sanitizer {<br>
unsigned IOCTL_TIOCSPGRP = TIOCSPGRP;<br>
unsigned IOCTL_TIOCSTI = TIOCSTI;<br>
unsigned IOCTL_TIOCSWINSZ = TIOCSWINSZ;<br>
-#if (SANITIZER_LINUX && !SANITIZER_ANDROID) || SANITIZER_MAC<br>
+#if (SANITIZER_LINUX && !SANITIZER_ANDROID)<br>
unsigned IOCTL_SIOCGETSGCNT = SIOCGETSGCNT;<br>
unsigned IOCTL_SIOCGETVIFCNT = SIOCGETVIFCNT;<br>
#endif<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h?rev=194841&r1=194840&r2=194841&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h?rev=194841&r1=194840&r2=194841&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h Fri Nov 15 13:13:08 2013<br>
@@ -503,7 +503,7 @@ namespace __sanitizer {<br>
extern unsigned struct_unimapinit_sz;<br>
#endif<br>
<br>
-#if !SANITIZER_ANDROID<br>
+#if !SANITIZER_ANDROID && !SANITIZER_MAC<br>
extern unsigned struct_sioc_sg_req_sz;<br>
extern unsigned struct_sioc_vif_req_sz;<br>
#endif<br>
@@ -558,7 +558,7 @@ namespace __sanitizer {<br>
extern unsigned IOCTL_TIOCSPGRP;<br>
extern unsigned IOCTL_TIOCSTI;<br>
extern unsigned IOCTL_TIOCSWINSZ;<br>
-#if (SANITIZER_LINUX && !SANITIZER_ANDROID) || SANITIZER_MAC<br>
+#if (SANITIZER_LINUX && !SANITIZER_ANDROID)<br>
extern unsigned IOCTL_SIOCGETSGCNT;<br>
extern unsigned IOCTL_SIOCGETVIFCNT;<br>
#endif<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>