[Mldonkey-commits] mldonkey distrib/ChangeLog src/utils/lib/stubs_c.c

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       12/07/01 17:28:06

Modified files:
        distrib        : ChangeLog 
        src/utils/lib  : stubs_c.c 

Log message:
        patch #7812

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1561&r2=1.1562
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/stubs_c.c?cvsroot=mldonkey&r1=1.48&r2=1.49

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1561
retrieving revision 1.1562
diff -u -b -r1.1561 -r1.1562
--- distrib/ChangeLog   24 Jun 2012 08:10:42 -0000      1.1561
+++ distrib/ChangeLog   1 Jul 2012 17:28:06 -0000       1.1562
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2012/07/01
+7812: FreeBSD: proper version identification (lioux)
+
 2012/06/24
 7805: Update upnp libraries
 7804: new option filenames_utf8 (ygrek)

Index: src/utils/lib/stubs_c.c
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/stubs_c.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- src/utils/lib/stubs_c.c     7 Aug 2010 14:52:34 -0000       1.48
+++ src/utils/lib/stubs_c.c     1 Jul 2012 17:28:06 -0000       1.49
@@ -31,6 +31,11 @@
 #include <sys/resource.h>
 #endif /* HAVE_SYS_RESOURCE_H */
 
+/* For proper FreeBSD version identification */
+#if defined(HAVE_SYS_PARAM_H)
+#include <sys/param.h>
+#endif
+
 #define lseek XXXXXXXXX
 #define read XXXXXXXXX
 #define ftruncate XXXXXXXXX
@@ -675,7 +680,7 @@
 
 #define NETDB_BUFFER_SIZE 10000
 
-#ifdef _WIN32
+#if defined(_WIN32) || ( defined(__FreeBSD_version) && ( ((__FreeBSD_version 
>= 504102) && (__FreeBSD_version < 600000)) || (__FreeBSD_version >= 600029) ) )
 #define GETHOSTBYADDR_IS_REENTRANT 1
 #define GETHOSTBYNAME_IS_REENTRANT 1
 #endif /* _WIN32 */