[Valgrind-developers] valgrind: r13405: Don't break platforms without AF_BLUETOOTH.

[<sv...@va...>]

mjw	2013-05-22 11:37:52 +0100 (Wed, 22 May 2013)

  New Revision: 13405

  Log:
    Don't break platforms without AF_BLUETOOTH.

  Modified files:
    trunk/coregrind/m_syswrap/syswrap-generic.c


  Modified: trunk/coregrind/m_syswrap/syswrap-generic.c (+5 -1)
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-generic.c	2013-05-22 11:21:10 +01:00 (rev 13404)
+++ trunk/coregrind/m_syswrap/syswrap-generic.c	2013-05-22 11:37:52 +01:00 (rev 13405)
@@ -941,7 +941,9 @@
    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 @@
          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, "" );