sresolv now compiles without IPv6

darcs-hash:20051206140821-1b897-e6841d44a0f48e3013cc8695a033687024e70444.gz

libsofia-sip-ua/nua/nua.h

@@ -88,8 +88,6 @@ typedef enum nua_event_e {
   nua_i_notify,			/**< Incoming event */
   nua_i_method,			/**< Incoming, unknown method */
 
-  nua_i_subscription,		/**< Incoming subscription to be authorized */
-
   nua_i_media_error,		/**< Offer-answer error indication */
 
   /* Responses */

libsofia-sip-ua/sresolv/sresolv.c

@@ -273,7 +273,7 @@ HTABLE_PROTOS(sres_qtable, qt, sres_query_t);
 #define SS_ADDR(ss) \
   ((ss)->ss_family == AF_INET ? \
    (void *)&((struct sockaddr_in *)ss)->sin_addr : \
-   (void *)&((struct sockaddr *)ss)->sa_data))
+   (void *)&((struct sockaddr *)ss)->sa_data)
 #endif
 
 /** Generate new 16-bit identifier for DNS query. */

libsofia-sip-ua/tport/tport.c

@@ -1184,7 +1184,7 @@ tport_primary_t *tport_listen(tport_master_t *mr, su_addrinfo_t const *ai,
     if (getsockname(s, &su->su_sa, &sulen) == SOCKET_ERROR)
       return TPORT_LISTEN_ERROR(su_errno(), getsockname);
 
-#if __linux__
+#if __linux__ && SU_HAVE_IN6
     if (ai->ai_family == AF_INET6) {
       if (SU_SOCKADDR_INADDR_ANY(su))
 	/* pri->pri_family2 = AF_INET */ ;