You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2007/01/22 21:54:02 UTC
svn commit: r498796 -
/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/unix/hysock.h
Author: hindessm
Date: Mon Jan 22 12:54:01 2007
New Revision: 498796
URL: http://svn.apache.org/viewvc?view=rev&rev=498796
Log:
Minor socket related changes for FreeBSD port.
Modified:
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/unix/hysock.h
Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/unix/hysock.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/unix/hysock.h?view=diff&rev=498796&r1=498795&r2=498796
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/unix/hysock.h (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/unix/hysock.h Mon Jan 22 12:54:01 2007
@@ -51,7 +51,11 @@
/* GLIBC_R: uses the GLIBC versions */
#define GLIBC_R (defined(LINUX))
/* ORIGINAL_R: the original gethostby* call is thread safe */
-#define ORIGINAL_R defined(false)
+#define ORIGINAL_R defined(FREEBSD)
+/* TOFIX: FreeBSD man page says:
+ * Though these functions are thread-safe, still it is recommended to use
+ * the getaddrinfo(3) family of functions, instead.
+ */
/* NO_R: gethostby*_r calls do not exist and the normal gethostby* calls are not threadsafe */
#define NO_R (defined(false))
/* OTHER_R: everything else */
@@ -108,8 +112,13 @@
#define OS_MCAST_LOOP IP_MULTICAST_LOOP
#if defined(IPv6_FUNCTION_SUPPORT)
#define OS_MCAST_INTERFACE_2 IPV6_MULTICAST_IF
+#if !defined(FREEBSD)
#define OS_IPV6_ADD_MEMBERSHIP IPV6_ADD_MEMBERSHIP
#define OS_IPV6_DROP_MEMBERSHIP IPV6_DROP_MEMBERSHIP
+#else
+#define OS_IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
+#define OS_IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
+#endif
#endif
/* defines for the unix error constants. These may be overriden for specific platforms. */
#define HYPORT_ERROR_SOCKET_UNIX_CONNRESET ECONNRESET