diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2023-11-07 20:20:01 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2023-11-30 22:52:11 +0100 |
| commit | f96a17225f088a5790655c01eaab9578c81a19f2 (patch) | |
| tree | 919bc1649c9ea3c73b01147417a7072f511d9fdf /src/corelib/thread | |
| parent | a2309116a8573a1a98dca82a737896313f7ace30 (diff) | |
Rename EINTR_LOOP -> QT_EINTR_LOOP
This non-namespaced macro was defined in a header, and while that
header is private, we shouldn't define non-namespaced macros in our
headers.
The macro also clashed with one of the same name defined in forkfd.c,
which broke unity-builds including the forkfd_qt.cpp TU. This rename
fixes that, too, so we can now remove forkfd_qt.cpp from
NO_UNITY_BUILD_SOURCES.
Pick-to: 6.6 6.5
Change-Id: Ic4bb4e4d7a632ca87905e48913db788a7c202314
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qthread_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp index 1a1ad98134..d5d61aed66 100644 --- a/src/corelib/thread/qthread_unix.cpp +++ b/src/corelib/thread/qthread_unix.cpp @@ -504,7 +504,7 @@ static void qt_nanosleep(timespec amount) // nanosleep is POSIX.1-1993 int r; - EINTR_LOOP(r, nanosleep(&amount, &amount)); + QT_EINTR_LOOP(r, nanosleep(&amount, &amount)); } void QThread::sleep(unsigned long secs) |