diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-11 11:16:42 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-11 11:16:42 +0200 |
| commit | 4e875d988e99df57c439f481e258e2138fdb9410 (patch) | |
| tree | 15f79917b0e303445976028cb541668a1ebb67f1 /src/corelib/io/qlockfile_unix.cpp | |
| parent | 6e42979518aa0697ff31706616ddbc05486f1864 (diff) | |
| parent | 3e75c2965c96fa014ab74121e84d623fd04a27f7 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Change-Id: Ieb8efee9d74229b9f141ec715e3a9557586b51e8
Diffstat (limited to 'src/corelib/io/qlockfile_unix.cpp')
| -rw-r--r-- | src/corelib/io/qlockfile_unix.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/io/qlockfile_unix.cpp b/src/corelib/io/qlockfile_unix.cpp index 4a12157607..b2bf77c0da 100644 --- a/src/corelib/io/qlockfile_unix.cpp +++ b/src/corelib/io/qlockfile_unix.cpp @@ -58,6 +58,11 @@ #include <sys/file.h> // flock #endif +#if defined(Q_OS_RTEMS) +# undef LOCK_EX +# undef LOCK_NB +#endif + #include <sys/types.h> // kill #include <signal.h> // kill #include <unistd.h> // gethostname |