diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-05-24 13:33:33 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-05-24 13:33:33 +0100 |
| commit | 2e7800cf650197f4b8998ef8ac24d08daa316a2f (patch) | |
| tree | 1f9e5e06b755f929c7bad363b77eaafdd21d706c /include/olm/account.hh | |
| parent | b1c5732fc8c89ee9217d0f54408f860565fa01f4 (diff) | |
| parent | 2fd28a66824bda7b86c08b065736009c39761987 (diff) | |
Merge branch 'rav/c_bindings'
Diffstat (limited to 'include/olm/account.hh')
| -rw-r--r-- | include/olm/account.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/olm/account.hh b/include/olm/account.hh index 209139a..6ea0d19 100644 --- a/include/olm/account.hh +++ b/include/olm/account.hh @@ -17,7 +17,7 @@ #include "olm/list.hh" #include "olm/crypto.hh" -#include "olm/error.hh" +#include "olm/error.h" #include <cstdint> @@ -44,7 +44,7 @@ struct Account { IdentityKeys identity_keys; List<OneTimeKey, MAX_ONE_TIME_KEYS> one_time_keys; std::uint32_t next_one_time_key_id; - ErrorCode last_error; + OlmErrorCode last_error; /** Number of random bytes needed to create a new account */ std::size_t new_account_random_length(); |