From: Mark Wielaard <mark@klomp.org>
Date: Wed, 22 May 2013 10:37:52 +0000 (+0000)
Subject: Don't break platforms without AF_BLUETOOTH.
X-Git-Tag: svn/VALGRIND_3_9_0~279
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6fd4d3b541a5e0f682dfb73ef4a9745d6decd4c5;p=thirdparty%2Fvalgrind.git

Don't break platforms without AF_BLUETOOTH.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13405
---

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index 3a6ea8224a..b85fd9ca21 100644
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -941,7 +941,9 @@ void pre_mem_read_sockaddr ( ThreadId tid,
    struct vki_sockaddr_un*  sun  = (struct vki_sockaddr_un *)sa;
    struct vki_sockaddr_in*  sin  = (struct vki_sockaddr_in *)sa;
    struct vki_sockaddr_in6* sin6 = (struct vki_sockaddr_in6 *)sa;
+#ifdef VKI_AF_BLUETOOTH
    struct vki_sockaddr_rc*  rc   = (struct vki_sockaddr_rc *)sa;
+#endif
 
    /* NULL/zero-length sockaddrs are legal */
    if ( sa == NULL || salen == 0 ) return;
@@ -981,13 +983,15 @@ void pre_mem_read_sockaddr ( ThreadId tid,
          PRE_MEM_READ( outmsg,
             (Addr) &sin6->sin6_scope_id, sizeof (sin6->sin6_scope_id) );
          break;
-               
+
+#ifdef VKI_AF_BLUETOOTH
       case VKI_AF_BLUETOOTH:
          VG_(sprintf) ( outmsg, description, "rc_bdaddr" );
          PRE_MEM_READ( outmsg, (Addr) &rc->rc_bdaddr, sizeof (rc->rc_bdaddr) );
          VG_(sprintf) ( outmsg, description, "rc_channel" );
          PRE_MEM_READ( outmsg, (Addr) &rc->rc_channel, sizeof (rc->rc_channel) );
          break;
+#endif
 
       default:
          VG_(sprintf) ( outmsg, description, "" );