diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-02-18 18:03:24 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-02-19 13:40:09 -0800 |
| commit | 3cccacd624574c4eeb6098846f8667c014567004 (patch) | |
| tree | d20c990d398d05acf85be67e29b3e8fa703f9f14 /src/corelib/global | |
| parent | 20575393f432178e14ccbbf7eb1f8babf9565b7d (diff) | |
qglobal_p.h: move QT_SUPPORTS_INIT_PRIORITY to outside the C++ section
Change-Id: Ic15405335d804bdea761fffd16d50d9c5fc5e237
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/global/qglobal_p.h b/src/corelib/global/qglobal_p.h index df4410ebde..e22c5b11ee 100644 --- a/src/corelib/global/qglobal_p.h +++ b/src/corelib/global/qglobal_p.h @@ -60,14 +60,6 @@ #include <QtCore/private/qtcore-config_p.h> #endif -#if defined(__cplusplus) -#ifdef Q_CC_MINGW -# include <unistd.h> // Define _POSIX_THREAD_SAFE_FUNCTIONS to obtain localtime_r() -#endif -#include <time.h> - -QT_BEGIN_NAMESPACE - #if defined(Q_CC_MSVC) # define QT_SUPPORTS_INIT_PRIORITY 1 // warning C4075: initializers put in unrecognized initialization area @@ -87,6 +79,14 @@ QT_BEGIN_NAMESPACE # define QT_SUPPORTS_INIT_PRIORITY 0 #endif +#if defined(__cplusplus) +#ifdef Q_CC_MINGW +# include <unistd.h> // Define _POSIX_THREAD_SAFE_FUNCTIONS to obtain localtime_r() +#endif +#include <time.h> + +QT_BEGIN_NAMESPACE + // These behave as if they consult the environment, so need to share its locking: Q_CORE_EXPORT void qTzSet(); Q_CORE_EXPORT time_t qMkTime(struct tm *when); |