tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add portable way of formatting khint_t type (from klib)

Browse Source
This commit is contained in:
Iestyn Pryce
2017-05-21 11:58:37 +01:00
parent d8239a9cc4
commit 87cf7b5bca
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/address_parser_train.c
View File

@@ -662,7 +662,7 @@ address_parser_t *address_parser_init(char *filename) {
} }
log_info("Done with vocab, total size=%zu\n", kh_size(vocab)); log_info("Done with vocab, total size=%" PRIkh32 "\n", kh_size(vocab));
for (k = kh_begin(vocab); k != kh_end(vocab); ++k) { for (k = kh_begin(vocab); k != kh_end(vocab); ++k) {
token = (char *)kh_key(vocab, k); token = (char *)kh_key(vocab, k);
@@ -676,7 +676,7 @@ address_parser_t *address_parser_init(char *filename) {
} }
} }
log_info("After pruning vocab size=%zu\n", kh_size(vocab)); log_info("After pruning vocab size=%" PRIkh32 "\n", kh_size(vocab));
log_info("Creating phrases trie\n"); log_info("Creating phrases trie\n");

4
src/klib/khash.h
View File

@@ -101,14 +101,18 @@ int main() {
#if UINT_MAX == 0xffffffffu #if UINT_MAX == 0xffffffffu
typedef unsigned int khint32_t; typedef unsigned int khint32_t;
#define PRIkh32 "u"
#elif ULONG_MAX == 0xffffffffu #elif ULONG_MAX == 0xffffffffu
typedef unsigned long khint32_t; typedef unsigned long khint32_t;
#define PRIkh32 "lu"
#endif #endif
#if ULONG_MAX == ULLONG_MAX #if ULONG_MAX == ULLONG_MAX
typedef unsigned long khint64_t; typedef unsigned long khint64_t;
#define PRIkh64 "lu"
#else #else
typedef unsigned long long khint64_t; typedef unsigned long long khint64_t;
#define PRIkh64 "llu"
#endif #endif
#ifndef kh_inline #ifndef kh_inline