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

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Wed Mar 27 15:29:11 UTC 2019


 sal/osl/unx/system.cxx |   21 ---------------------
 1 file changed, 21 deletions(-)

New commits:
commit 58b3982a15eb55f2d4c364d256f37970e1390392
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Mar 27 13:02:03 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Mar 27 16:28:43 2019 +0100

    Remove unused macros that caused compiler warnings and simplify
    
    Change-Id: Ica146899a5557732babf4e07b20b9e3d32426c6e
    Reviewed-on: https://gerrit.libreoffice.org/69824
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/sal/osl/unx/system.cxx b/sal/osl/unx/system.cxx
index f17a8c19493a..875f4101667c 100644
--- a/sal/osl/unx/system.cxx
+++ b/sal/osl/unx/system.cxx
@@ -26,33 +26,12 @@
 
 #ifdef NO_PTHREAD_RTL
 
-/* struct passwd differs on some platforms */
-
-#if defined(MACOSX) || defined(IOS) || defined(OPENBSD) || defined(NETBSD) || defined(HAIKU)
-
-//No mutex needed on macOS, gethostbyname is thread safe
-
 #if defined(MACOSX)
 
-#define RTL_MUTEX_LOCK
-#define RTL_MUTEX_UNLOCK
-
 #include <premac.h>
 #include <Foundation/Foundation.h>
 #include <postmac.h>
 
-#else //defined(MACOSX)
-
-static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-#define RTL_MUTEX_LOCK pthread_mutex_lock(&getrtl_mutex);
-#define RTL_MUTEX_UNLOCK pthread_mutex_unlock(&getrtl_mutex);
-
-#endif //defined(MACOSX)
-
-#endif // OSX || IOS || OPENBSD || NETBSD
-
-#if defined(MACOSX)
 /*
  * Add support for resolving Mac native alias files (not the same as unix alias files)
  * (what are "unix alias files"?)


More information about the Libreoffice-commits mailing list