[compiler-rt] r194841 - Remove #include of net/ip_mroute.h for SANITIZER_MAC.

[Alexander Potapenko]

LGTM iff the tests pass.
On Nov 15, 2013 11:18 PM, "Bob Wilson" <bob.wilson at apple.com> wrote:

> Author: bwilson
> Date: Fri Nov 15 13:13:08 2013
> New Revision: 194841
>
> URL: http://llvm.org/viewvc/llvm-project?rev=194841&view=rev
> Log:
> Remove #include of net/ip_mroute.h for SANITIZER_MAC.
>
> This header has not been supported at all for the last 2 major OS X
> releases.
> Removed its include and the capture of related symbols.
>
> <rdar://problem/15303348>
>
> Modified:
>
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
>
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
>
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h
>
> Modified:
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
> URL:
> 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
>
> ==============================================================================
> ---
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
> (original)
> +++
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
> Fri Nov 15 13:13:08 2013
> @@ -88,7 +88,7 @@ static void ioctl_table_fill() {
>    _(TIOCSTI, READ, sizeof(char));
>    _(TIOCSWINSZ, READ, struct_winsize_sz);
>
> -#if (SANITIZER_LINUX && !SANITIZER_ANDROID) || SANITIZER_MAC
> +#if (SANITIZER_LINUX && !SANITIZER_ANDROID)
>    _(SIOCGETSGCNT, WRITE, struct_sioc_sg_req_sz);
>    _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
>  #endif
>
> Modified:
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
> URL:
> 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
>
> ==============================================================================
> ---
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
> (original)
> +++
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
> Fri Nov 15 13:13:08 2013
> @@ -114,7 +114,6 @@
>
>  #if SANITIZER_MAC
>  #include <net/ethernet.h>
> -#include <netinet/ip_mroute.h>
>  #include <sys/filio.h>
>  #include <sys/mount.h>
>  #include <sys/sockio.h>
> @@ -325,7 +324,7 @@ namespace __sanitizer {
>    unsigned struct_unimapinit_sz = sizeof(struct unimapinit);
>  #endif
>
> -#if !SANITIZER_ANDROID
> +#if !SANITIZER_ANDROID && !SANITIZER_MAC
>    unsigned struct_sioc_sg_req_sz = sizeof(struct sioc_sg_req);
>    unsigned struct_sioc_vif_req_sz = sizeof(struct sioc_vif_req);
>  #endif
> @@ -376,7 +375,7 @@ namespace __sanitizer {
>    unsigned IOCTL_TIOCSPGRP = TIOCSPGRP;
>    unsigned IOCTL_TIOCSTI = TIOCSTI;
>    unsigned IOCTL_TIOCSWINSZ = TIOCSWINSZ;
> -#if (SANITIZER_LINUX && !SANITIZER_ANDROID) || SANITIZER_MAC
> +#if (SANITIZER_LINUX && !SANITIZER_ANDROID)
>    unsigned IOCTL_SIOCGETSGCNT = SIOCGETSGCNT;
>    unsigned IOCTL_SIOCGETVIFCNT = SIOCGETVIFCNT;
>  #endif
>
> Modified:
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h
> URL:
> 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
>
> ==============================================================================
> ---
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h
> (original)
> +++
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h
> Fri Nov 15 13:13:08 2013
> @@ -503,7 +503,7 @@ namespace __sanitizer {
>    extern unsigned struct_unimapinit_sz;
>  #endif
>
> -#if !SANITIZER_ANDROID
> +#if !SANITIZER_ANDROID && !SANITIZER_MAC
>    extern unsigned struct_sioc_sg_req_sz;
>    extern unsigned struct_sioc_vif_req_sz;
>  #endif
> @@ -558,7 +558,7 @@ namespace __sanitizer {
>    extern unsigned IOCTL_TIOCSPGRP;
>    extern unsigned IOCTL_TIOCSTI;
>    extern unsigned IOCTL_TIOCSWINSZ;
> -#if (SANITIZER_LINUX && !SANITIZER_ANDROID) || SANITIZER_MAC
> +#if (SANITIZER_LINUX && !SANITIZER_ANDROID)
>    extern unsigned IOCTL_SIOCGETSGCNT;
>    extern unsigned IOCTL_SIOCGETVIFCNT;
>  #endif
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20131116/4052218c/attachment.html>