[merge] merging master

This commit is contained in:
Al
2017-01-13 19:58:49 -05:00
27 changed files with 181 additions and 55 deletions

View File

@@ -21,7 +21,8 @@
#define ALL_LANGUAGES "all"
#define DEFAULT_ADDRESS_EXPANSION_PATH LIBPOSTAL_DATA_DIR PATH_SEPARATOR "address_expansions" PATH_SEPARATOR "address_dictionary.dat"
#define ADDRESS_DICTIONARY_DATA_FILE "address_dictionary.dat"
#define DEFAULT_ADDRESS_EXPANSION_PATH LIBPOSTAL_DATA_DIR PATH_SEPARATOR LIBPOSTAL_ADDRESS_EXPANSIONS_SUBDIR PATH_SEPARATOR ADDRESS_DICTIONARY_DATA_FILE
#define NULL_CANONICAL_INDEX -1