summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-07-19 08:39:37 +0000
committerKurt Zenker <kz@openoffice.org>2006-07-19 08:39:37 +0000
commit5c492b7a145380fa7b4590e07643377532288af4 (patch)
tree7fff46940ef0aa7f6c15e8eea085f29fb61b0509
parent0ee06f90ee579f48c607aa9fed5923822b4f48ba (diff)
INTEGRATION: CWS freebsd07 (1.12.8); FILE MERGED
2006/07/01 06:07:28 maho 1.12.8.1: #i65512# FreeBSD >= 700015 support.\n This commit is a result of hacks at the CodeFest Akihabara 2006 hosted by FSIJ.
-rw-r--r--sal/osl/unx/system.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index d2247622e364..3459feafbe06 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -4,9 +4,9 @@
*
* $RCSfile: system.c,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: hr $ $Date: 2006-06-20 04:19:35 $
+ * last change: $Author: kz $ $Date: 2006-07-19 09:39:37 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -343,6 +343,8 @@ struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int
}
#endif /* defined SCO */
+#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
+
extern int h_errno;
struct hostent *gethostbyname_r(const char *name, struct hostent *result,
@@ -433,6 +435,7 @@ struct hostent *gethostbyname_r(const char *name, struct hostent *result,
return res;
}
+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
#if defined(MACOSX)
/*