diff options
Diffstat (limited to 'src/corelib/kernel/qcore_unix_p.h')
| -rw-r--r-- | src/corelib/kernel/qcore_unix_p.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h index 8f37aec6e2..86bace3260 100644 --- a/src/corelib/kernel/qcore_unix_p.h +++ b/src/corelib/kernel/qcore_unix_p.h @@ -55,7 +55,6 @@ #include <QtCore/private/qglobal_p.h> #include "qplatformdefs.h" #include "qatomic.h" -#include "qhash.h" #ifndef Q_OS_UNIX # error "qcore_unix_p.h included on a non-Unix system" @@ -369,19 +368,6 @@ union qt_semun { unsigned short *array; /* array for GETALL, SETALL */ }; -#ifndef QT_POSIX_IPC -#if QT_CONFIG(sharedmemory) || QT_CONFIG(systemsemaphore) -#ifndef Q_OS_ANDROID -static inline key_t qt_safe_ftok(const QByteArray &filename, int proj_id) -{ - // Unfortunately ftok can return colliding keys even for different files. - // Try to add some more entropy via qHash. - return ::ftok(filename.constData(), qHash(filename, proj_id)); -} -#endif // !Q_OS_ANDROID -#endif // QT_CONFIG(sharedmemory) || QT_CONFIG(systemsemaphore) -#endif // !QT_POSIX_IPC - QT_END_NAMESPACE #endif |