[Libreoffice-commits] core.git: include/osl sal/osl

[Riccardo Magliocchetti]

 include/osl/endian.h |    7 -------
 sal/osl/unx/socket.c |    2 +-
 sal/osl/unx/system.h |   13 ++-----------
 3 files changed, 3 insertions(+), 19 deletions(-)

New commits:
commit b471943640f51e252046e2c91a7cb00d72f8d07c
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Fri Aug 8 14:47:59 2014 +0200

    osl: kill check for ancient freebsd < 7 versions
    
    Change-Id: I082611edd88daae36181d62f9fc56b588630629b
    Reviewed-on: https://gerrit.libreoffice.org/10828
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/include/osl/endian.h b/include/osl/endian.h
index 30fa42b..0819dee 100644
--- a/include/osl/endian.h
+++ b/include/osl/endian.h
@@ -80,13 +80,6 @@ extern "C" {
 #ifdef FREEBSD
 #   include <sys/param.h>
 #   include <machine/endian.h>
-#if __FreeBSD_version < 500000
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
-#   elif BYTE_ORDER == BIG_ENDIAN
-#       define _BIG_ENDIAN
-#   endif
-#endif
 #endif
 
 #ifdef AIX
diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c
index d28413b..602135e 100644
--- a/sal/osl/unx/socket.c
+++ b/sal/osl/unx/socket.c
@@ -728,7 +728,7 @@ static struct hostent* _osl_gethostbyname_r (
     const char *name, struct hostent *result,
     char *buffer, int buflen, int *h_errnop)
 {
-#if defined(LINUX) || defined(ANDROID) || (defined(FREEBSD) && (__FreeBSD_version >= 601103)) || defined(DRAGONFLY)
+#if defined(LINUX) || defined(ANDROID) || (defined(FREEBSD) || defined(DRAGONFLY)
     struct hostent *__result; /* will be the same as result */
     int __error;
     __error = gethostbyname_r (name, result, buffer, buflen,
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index 33aef24..d952518 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -131,13 +131,6 @@
 #   include <netinet/tcp.h>
 #   define  IORESOURCE_TRANSFER_BSD
 #   include <machine/endian.h>
-#if __FreeBSD_version < 500000
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
-#   elif BYTE_ORDER == BIG_ENDIAN
-#       define _BIG_ENDIAN
-#   endif
-#endif
 #   define  NO_PTHREAD_RTL
 #endif
 
@@ -395,7 +388,7 @@ typedef struct sockaddr_ipx {
 /* END HACK */
 
 #ifdef NO_PTHREAD_RTL
-#if !defined FREEBSD || (__FreeBSD_version < 500112)
+#if !defined FREEBSD
 #if !defined NETBSD
 struct passwd *getpwent_r(struct passwd *pwd, char *buffer,  int buflen);
 #endif
@@ -406,11 +399,9 @@ extern struct spwd *getspnam_r(const char *name, struct spwd *result,
 struct tm *localtime_r(const time_t *timep, struct tm *buffer);
 struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
 #endif
-#endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
-#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
 struct hostent *gethostbyname_r(const char *name, struct hostent *result,
                                 char *buffer, size_t buflen, int *h_errnop);
-#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
+#endif /* !defined(FREEBSD) */
 #endif
 
 #endif // INCLUDED_SAL_OSL_UNX_SYSTEM_H