sal/osl/unx/system.c | 34 ----------------------------------
1 file changed, 34 deletions(-)
New commits:
commit 04962221c3a0be2ef46fcc9b8f4da58b9947a6ee
Author: Arnaud Versini <arnaud.vers...@gmail.com>
Date: Sat Dec 1 20:42:50 2012 +0100
Remove useless getpid implementation on Linux.
The new minimal target have a proper getpid implementation.
Change-Id: I1cf209d8b4cb651866287c3a682ebd0806ab35b9
Reviewed-on: https://gerrit.libreoffice.org/1219
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index 328f4fc..fca7655 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -207,40 +207,6 @@ int macxp_resolveAlias(char *path, int buflen)
#endif /* NO_PTHREAD_RTL */
-#if defined(LINUX) && defined (__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__
< 4
-/* The linux kernel 2.4 getpid implemention always return the pid of the
- thread subprocess and not of the main process, the NPTL implementation
- with a Linux kernel 2.6 kernel return the pid. So when possibly
- there is the wrong implementation of getpid, we save the pid at startup.
- FIXME: when our Linux base-line is above:
- + Linux kernel version 2.6 or higher; -> clone() for NTPL
- + glibc2 version 2.4 or higher; -> No longer LinuxThreads, only NPTL
- Then we get a working getpid() and can remove this hack.
- FIXME: getppid is also wrong in this situation
-*/
-
-// Directly from libc.so.6, obviously missing from some unistd.h:
-extern __pid_t __getpid(void);
-
-static pid_t pid = -1;
-
-static void savePid(void) __attribute__((constructor));
-
-static void savePid(void)
-{
- if (pid == -1)
- pid = __getpid();
-}
-
-pid_t getpid(void)
-{
- if (pid == -1)
- savePid();
-
- return (pid);
-}
-#endif /* defined LINUX */
-
#ifdef NO_PTHREAD_SEMAPHORES
int sem_init(sem_t* sem, int pshared, unsigned int value)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
