diff options
| author | Gleb Popov <6yearold@gmail.com> | 2020-10-05 10:27:02 +0400 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-10-08 08:04:03 +0200 |
| commit | d775d570ea336d1d0d9e9c778d6841e9b64d2ad1 (patch) | |
| tree | ba97676b8ac9b620e02248f536fc073398b8214f | |
| parent | 7109b69ff3d5102f408e5c53932b870196a42cec (diff) | |
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@collabora.com>
| -rw-r--r-- | sal/osl/unx/system.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
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> |