Ticket #50288: leopard-IPV6_TCLASS.patch

gpsd.c

@@ -149 +149 @@
 static int sd_socket_count = 0;
 #endif
 
-/* work around the unfinished ipv6 implementation on hurd */
-#ifdef __GNU__
+/* work around the unfinished ipv6 implementation on hurd and OSX <10.6 */
 #ifndef IPV6_TCLASS
-#define IPV6_TCLASS 61
-#endif
+# if defined(__GNU__)
+#  define IPV6_TCLASS 61
+# elif defined(__APPLE__)
+#  define IPV6_TCLASS 36
+# endif
 #endif
 
 static volatile sig_atomic_t signalled;
@@ -406 +408 @@
                 (void)close(s);
                 return -1;
             }
+#ifdef IPV6_TCLASS
             /* Set packet priority */
             if (setsockopt(s, IPPROTO_IPV6, IPV6_TCLASS, &dscp, sizeof(dscp)) == -1)
                 gpsd_log(&context.errout, LOG_WARN,
                          "Warning: SETSOCKOPT TOS failed\n");
+#endif /* IPV6_TCLASS */
         }
         break;
 #endif  /* IPV6_ENABLE */

netlib.c

@@ -21 +21 @@
 #include "gpsd.h"
 #include "sockaddr.h"
 
+/* work around the unfinished ipv6 implementation on hurd and OSX <10.6 */
+#ifndef IPV6_TCLASS
+# if defined(__GNU__)
+#  define IPV6_TCLASS 61
+# elif defined(__APPLE__)
+#  define IPV6_TCLASS 36
+# endif
+#endif
+
 socket_t netlib_connectsock(int af, const char *host, const char *service,
                             const char *protocol)
 {