Index: sal/osl/unx/socket.c
===================================================================
RCS file: /cvs/porting/sal/osl/unx/socket.c,v
retrieving revision 1.22.10.1
diff -u -r1.22.10.1 socket.c
--- sal/osl/unx/socket.c	18 Aug 2003 15:12:26 -0000	1.22.10.1
+++ sal/osl/unx/socket.c	10 Sep 2006 03:18:08 -0000
@@ -836,7 +836,7 @@
 	const char *name, struct hostent *result,
 	char *buffer, int buflen, int *h_errnop)
 {
-#ifdef LINUX
+#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103))
 	struct hostent *__result; /* will be the same as result */
 	int __error;
 	__error = gethostbyname_r (name, result, buffer, buflen,
Index: sal/osl/unx/system.c
===================================================================
RCS file: /cvs/porting/sal/osl/unx/system.c,v
retrieving revision 1.8
diff -u -r1.8 system.c
--- sal/osl/unx/system.c	16 Jul 2003 17:21:47 -0000	1.8
+++ sal/osl/unx/system.c	10 Sep 2006 03:18:08 -0000
@@ -371,6 +371,8 @@
 
 extern int h_errno;
 
+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
+
 struct hostent *gethostbyname_r(const char *name, struct hostent *result,
 								char *buffer, int buflen, int *h_errnop)
 {
@@ -459,6 +461,8 @@
 
   	return res;
 }
+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
+
 
 #if defined(MACOSX)
 /*
 
--- sal/osl/unx/system.h.orig	Fri Aug 15 20:38:50 2003
+++ sal/osl/unx/system.h	Sun Sep 10 13:32:43 2006
@@ -576,8 +576,10 @@
 struct tm *localtime_r(const time_t *timep, struct tm *buffer);
 struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
 #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
 struct hostent *gethostbyname_r(const char *name, struct hostent *result,
 								char *buffer, int buflen, int *h_errnop);
+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
 #endif
 
 #endif /* __OSL_SYSTEM_H__ */