diff options
| author | B Stack <bgstack15@gmail.com> | 2020-09-01 00:24:17 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-09-01 00:24:17 +0000 |
| commit | 5a3f52b016581a6a0cb4513614b6c620d365dde2 (patch) | |
| tree | acfdfb3e1046db87040477033fda0df76d92916a /zen/guid.h | |
| parent | Merge branch '11.0' into 'master' (diff) | |
| parent | add upstream 11.1 (diff) | |
| download | FreeFileSync-5a3f52b016581a6a0cb4513614b6c620d365dde2.tar.gz FreeFileSync-5a3f52b016581a6a0cb4513614b6c620d365dde2.tar.bz2 FreeFileSync-5a3f52b016581a6a0cb4513614b6c620d365dde2.zip | |
Merge branch '11.1' into 'master'11.1
add upstream 11.1
See merge request opensource-tracking/FreeFileSync!25
Diffstat (limited to 'zen/guid.h')
| -rw-r--r-- | zen/guid.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -20,11 +20,11 @@ std::string generateGUID() //creates a 16-byte GUID { std::string guid(16, '\0'); -#ifndef __GLIBC__ -#error Where is GLIB? +#ifndef __GLIBC_PREREQ +#error Where is Glibc? #endif -#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 25) //getentropy() requires glibc 2.25 (ldd --version) PS: CentOS 7 is on 2.17 +#if __GLIBC_PREREQ(2, 25) //getentropy() requires Glibc 2.25 (ldd --version) PS: CentOS 7 is on 2.17 if (::getentropy(&guid[0], guid.size()) != 0) //"The maximum permitted value for the length argument is 256" throw std::runtime_error(std::string(__FILE__) + '[' + numberTo<std::string>(__LINE__) + "] Failed to generate GUID." + "\n\n" + utfTo<std::string>(formatSystemError("getentropy", errno))); |