[Libreoffice-commits] .: sal/osl

[Matus Kukan]

 sal/osl/unx/system.c |    4 ++--
 sal/osl/unx/system.h |   31 -------------------------------
 2 files changed, 2 insertions(+), 33 deletions(-)

New commits:
commit e92dd410fd15fcb291386a0cbfc1d6247b1fc26b
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Aug 29 16:28:39 2011 +0200

    We do not need to use GLIBC here

diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index e077291..4bb0e46 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -201,7 +201,7 @@ int macxp_resolveAlias(char *path, int buflen)
 
 #endif /* NO_PTHREAD_RTL */
 
-#if (defined (LINUX) && (GLIBC >= 2))
+#if defined(LINUX)
 /* The linux kernel thread implemention, always return the pid of the
    thread subprocess and not of the main process. So we save the main
    pid at startup
@@ -227,7 +227,7 @@ pid_t getpid(void)
 
     return (pid);
 }
-#endif /*  (defined (LINUX) && (GLIBC >= 2)) */
+#endif /*  defined LINUX */
 
 #ifdef NO_PTHREAD_SEMAPHORES
 int sem_init(sem_t* sem, int pshared, unsigned int value)
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index ef6d884..c8f4871 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -72,7 +72,6 @@
 #   define __USE_GNU
 #   endif
 
-#if GLIBC >= 2
 #   include <shadow.h>
 #   include <pthread.h>
 #   include <sys/file.h>
@@ -98,36 +97,6 @@
 #   define  pthread_testcancel()
 #   define  NO_PTHREAD_PRIORITY
 #   define  PTHREAD_SIGACTION           pthread_sigaction
-#else
-#   include <shadow.h>
-#   include <asm/sigcontext.h>
-#   include <pthread.h>
-#   include <sys/file.h>
-#   include <sys/ioctl.h>
-#   include <linux/net.h>
-#   include <sys/un.h>
-#   include <netinet/tcp.h>
-#   include <linux/elfcore.h>
-#   include <dlfcn.h>
-#   include <endian.h>
-#   if __BYTE_ORDER == __LITTLE_ENDIAN
-#       ifndef _LITTLE_ENDIAN
-#           define _LITTLE_ENDIAN
-#       endif
-#   elif __BYTE_ORDER == __BIG_ENDIAN
-#       ifndef _BIG_ENDIAN
-#           define _BIG_ENDIAN
-#       endif
-#   elif __BYTE_ORDER == __PDP_ENDIAN
-#       define _PDP_ENDIAN
-#   endif
-#   define  IORESOURCE_TRANSFER_BSD
-#   define  IOCHANNEL_TRANSFER_BSD_RENO
-#   define  pthread_testcancel()
-#   define  NO_PTHREAD_RTL
-#   define  NO_PTHREAD_PRIORITY
-#   define  PTHREAD_SIGACTION           pthread_sigaction
-#endif
 
 #   ifndef ETIME
 #       define ETIME ETIMEDOUT