diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-07-02 23:09:49 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-07-06 00:23:59 +0000 |
| commit | 9ca3443a37284bedaf74475c26af173b00757178 (patch) | |
| tree | a2ab73d7c25bd118f2b719b885e6aa02b40bc4f2 /src/corelib/global | |
| parent | d38122f4a2698038958f3a1c4654d8eba20bff95 (diff) | |
Rename the "sys_auxv" feature to "getauxval"
Change-Id: I8d96dea9955d4c749b99fffd14cdbd1e69940d33
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qconfig-bootstrapped.h | 2 | ||||
| -rw-r--r-- | src/corelib/global/qrandom.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h index 7dba4ae5da..398da739e1 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h @@ -76,6 +76,7 @@ # define QT_FEATURE_alloca_malloc_h -1 #endif #define QT_FEATURE_cxx11_random (QT_HAS_INCLUDE(<random>) ? 1 : -1) +#define QT_FEATURE_getauxval (QT_HAS_INCLUDE(<sys/auxv.h>) ? 1 : -1) #define QT_FEATURE_getentropy -1 #define QT_FEATURE_iconv -1 #define QT_FEATURE_icu -1 @@ -98,7 +99,6 @@ #define QT_NO_GEOM_VARIANT #define QT_FEATURE_sharedmemory -1 #define QT_FEATURE_systemsemaphore -1 -#define QT_FEATURE_sys_auxv (QT_HAS_INCLUDE(<sys/auxv.h>) ? 1 : -1) #ifdef QT_BUILD_QMAKE #define QT_FEATURE_commandlineparser -1 diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp index daa9f25122..6e368ac75b 100644 --- a/src/corelib/global/qrandom.cpp +++ b/src/corelib/global/qrandom.cpp @@ -57,7 +57,7 @@ # include "qhashfunctions.h" # endif -# if QT_CONFIG(sys_auxv) +# if QT_CONFIG(getauxval) # include <sys/auxv.h> # endif #endif // !QT_CONFIG(getentropy) @@ -291,7 +291,7 @@ static void fallback_fill(quint32 *ptr, qssize_t left) Q_DECL_NOTHROW if (quint32 v = seed.load()) *end++ = v; // 6 -#if QT_CONFIG(sys_auxv) +#if QT_CONFIG(getauxval) // works on Linux -- all modern libc have getauxval # ifdef AT_RANDOM // ELF's auxv AT_RANDOM has 16 random bytes |