diff options
| author | lloyd <[email protected]> | 2014-02-21 22:50:14 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2014-02-21 22:50:14 +0000 |
| commit | 4a8feb3bdd422aede7c888ff97bb5f39cebb1f63 (patch) | |
| tree | d9b6a532ca6a4e550f4d125913e5cfa3e82cde16 | |
| parent | 6f96b54519ba799418fca4e4efd2a0c60163d052 (diff) | |
Use stdint.h instead of cstdint for Clang. Bugzilla 266
| -rw-r--r-- | doc/relnotes/1_11_9.rst | 3 | ||||
| -rw-r--r-- | src/lib/utils/types.h | 16 |
2 files changed, 12 insertions, 7 deletions
diff --git a/doc/relnotes/1_11_9.rst b/doc/relnotes/1_11_9.rst index 6ee0b4baf..85cfcb843 100644 --- a/doc/relnotes/1_11_9.rst +++ b/doc/relnotes/1_11_9.rst @@ -7,3 +7,6 @@ Version 1.11.9, Not Yet Released * Fix a bug introduced in 1.11.5 which could cause crashes or other incorrect behavior when a cipher mode filter was followed in the pipe by another filter, and that filter had a non-empty start_msg. + + * The types.h header now uses stdint.h rather than cstdint to avoid + problems with Clang on OS X. diff --git a/src/lib/utils/types.h b/src/lib/utils/types.h index 253aaa66a..13bb4b604 100644 --- a/src/lib/utils/types.h +++ b/src/lib/utils/types.h @@ -11,7 +11,7 @@ #include <botan/build.h> #include <botan/assert.h> #include <cstddef> -#include <cstdint> +#include <stdint.h> #include <memory> /** @@ -19,18 +19,20 @@ */ namespace Botan { -using std::uint8_t; -using std::uint16_t; -using std::uint32_t; -using std::uint64_t; -using std::size_t; +using ::uint8_t; +using ::uint16_t; +using ::uint32_t; +using ::uint64_t; +using ::int32_t; + +using ::size_t; typedef uint8_t byte; typedef uint16_t u16bit; typedef uint32_t u32bit; typedef uint64_t u64bit; -typedef std::int32_t s32bit; +typedef int32_t s32bit; /** * A default buffer size; typically a memory page |