80 lines
2.9 KiB
Text
80 lines
2.9 KiB
Text
Index: sal/osl/unx/socket.c
|
|
===================================================================
|
|
RCS file: /cvs/porting/sal/osl/unx/socket.c,v
|
|
retrieving revision 1.26
|
|
diff -u -r1.26 socket.c
|
|
--- sal/osl/unx/socket.c 19 Jul 2006 09:39:22 -0000 1.26
|
|
+++ sal/osl/unx/socket.c 29 Jul 2006 09:53:04 -0000
|
|
@@ -813,7 +813,7 @@
|
|
const char *name, struct hostent *result,
|
|
char *buffer, int buflen, int *h_errnop)
|
|
{
|
|
-#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 700015))
|
|
+#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.13
|
|
diff -u -r1.13 system.c
|
|
--- sal/osl/unx/system.c 19 Jul 2006 09:39:37 -0000 1.13
|
|
+++ sal/osl/unx/system.c 9 Sep 2006 09:57:26 -0000
|
|
@@ -343,7 +343,7 @@
|
|
}
|
|
#endif /* defined SCO */
|
|
|
|
-#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
|
|
+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
|
|
|
|
extern int h_errno;
|
|
|
|
@@ -435,7 +435,7 @@
|
|
|
|
return res;
|
|
}
|
|
-#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
|
|
+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
|
|
|
|
#if defined(MACOSX)
|
|
/*
|
|
|
|
Index: sal/osl/unx/system.h
|
|
===================================================================
|
|
RCS file: /cvs/porting/sal/osl/unx/system.h,v
|
|
retrieving revision 1.33
|
|
diff -u -r1.33 system.h
|
|
--- sal/osl/unx/system.h 19 Jul 2006 09:39:50 -0000 1.33
|
|
+++ sal/osl/unx/system.h 9 Sep 2006 09:55:55 -0000
|
|
@@ -537,10 +537,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 < 700015)
|
|
+#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 < 700015) */
|
|
+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
|
|
#endif
|
|
|
|
#endif /* __OSL_SYSTEM_H__ */
|
|
|
|
Index: moz/mozilla-source-1.7.5.patch
|
|
===================================================================
|
|
RCS file: /cvs/external/moz/mozilla-source-1.7.5.patch,v
|
|
retrieving revision 1.11
|
|
diff -u -r1.11 mozilla-source-1.7.5.patch
|
|
--- moz/mozilla-source-1.7.5.patch 19 Jul 2006 09:37:17 -0000 1.11
|
|
+++ moz/mozilla-source-1.7.5.patch 29 Jul 2006 09:53:10 -0000
|
|
@@ -7705,7 +7705,7 @@
|
|
|
|
-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
|
|
+#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
|
|
-+ (defined(__FreeBSD__) && __FreeBSD_version > 700016)
|
|
++ (defined(__FreeBSD__) && __FreeBSD_version > 601103)
|
|
#define _PR_HAVE_GETPROTO_R
|
|
#define _PR_HAVE_5_ARG_GETPROTO_R
|
|
#endif
|
|
|