diff options
| author | Simon Cogliani <[email protected]> | 2016-07-31 13:38:44 +0200 |
|---|---|---|
| committer | Simon Cogliani <[email protected]> | 2016-07-31 13:38:44 +0200 |
| commit | a8f5fde59a8e0988bafd99853957b17ef54301a0 (patch) | |
| tree | d5c85afc3529a1257dfeda0995ec3679a7df2f41 | |
| parent | 8c305d9969ed0690d5603b75fd151cb7a33138f0 (diff) | |
| parent | bca8bef636823abfb4b81fea82df943d4f4499a5 (diff) | |
Merge branch 'master' into frp256v1
| -rw-r--r-- | src/lib/utils/filesystem.cpp | 2 | ||||
| -rw-r--r-- | src/lib/utils/mul128.h | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/lib/utils/filesystem.cpp b/src/lib/utils/filesystem.cpp index 8d51e64bd..c67668288 100644 --- a/src/lib/utils/filesystem.cpp +++ b/src/lib/utils/filesystem.cpp @@ -90,7 +90,7 @@ std::vector<std::string> impl_readdir(const std::string& dir_path) struct stat stat_buf; - if(::lstat(full_path.c_str(), &stat_buf) == -1) + if(::stat(full_path.c_str(), &stat_buf) == -1) continue; if(S_ISDIR(stat_buf.st_mode)) diff --git a/src/lib/utils/mul128.h b/src/lib/utils/mul128.h index bcf5fa7ef..fe533c720 100644 --- a/src/lib/utils/mul128.h +++ b/src/lib/utils/mul128.h @@ -12,13 +12,15 @@ namespace Botan { -// Prefer TI mode over __int128 as GCC rejects the latter in pendantic mode -#if (BOTAN_GCC_VERSION > 440) && defined(BOTAN_TARGET_CPU_HAS_NATIVE_64BIT) +#if defined(__SIZEOF_INT128__) && defined(BOTAN_TARGET_CPU_HAS_NATIVE_64BIT) #define BOTAN_TARGET_HAS_NATIVE_UINT128 - typedef unsigned int uint128_t __attribute__((mode(TI))); -#elif defined(__SIZEOF_INT128__) - #define BOTAN_TARGET_HAS_NATIVE_UINT128 - typedef unsigned __int128 uint128_t; + + // Prefer TI mode over __int128 as GCC rejects the latter in pendantic mode + #if defined(__GNUG__) + typedef unsigned int uint128_t __attribute__((mode(TI))); + #else + typedef unsigned __int128 uint128_t; + #endif #endif } |