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

[Gleb Popov (via logerrit)]

 sal/osl/unx/system.hxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit d775d570ea336d1d0d9e9c778d6841e9b64d2ad1
Author:     Gleb Popov <6yearold at gmail.com>
AuthorDate: Mon Oct 5 10:27:02 2020 +0400
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Thu Oct 8 08:04:03 2020 +0200

    Do not redefine ETIME unconditionally on FreeBSD.
    
    Change-Id: Iee5e7d3e91b6da5eb6c87d8d3547e0cd65742db7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103945
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/sal/osl/unx/system.hxx b/sal/osl/unx/system.hxx
index bbf9c0449357..a8b0e10cd163 100644
--- a/sal/osl/unx/system.hxx
+++ b/sal/osl/unx/system.hxx
@@ -136,7 +136,9 @@
 #endif
 
 #ifdef FREEBSD
-#   define  ETIME ETIMEDOUT
+#   ifndef ETIME
+#       define ETIME ETIMEDOUT
+#   endif
 #   include <pthread.h>
 #   include <sys/sem.h>
 #   include <dlfcn.h>