From af56c3cd09cb5cf100a837ec69a998c31a055965 Mon Sep 17 00:00:00 2001 From: Al Date: Wed, 1 Jul 2015 13:01:22 -0400 Subject: [PATCH] [config] constants --- src/config.h | 7 ++++++- src/constants.h | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/config.h b/src/config.h index 00052723..21718a98 100644 --- a/src/config.h +++ b/src/config.h @@ -1,6 +1,11 @@ #ifndef CONFIG_H #define CONFIG_H -#define LIBPOSTAL_DATA_DIR "../data" +#include "file_utils.h" + +#define LIBPOSTAL_DATA_DIR ".." PATH_SEPARATOR "data" + +#define LIBPOSTAL_DICTIONARIES_DIR LIBPOSTAL_DATA_DIR PATH_SEPARATOR "dictionaries" +#define LIBPOSTAL_GEONAMES_DIR LIBPOSTAL_DATA_DIR PATH_SEPARATOR "geonames" #endif \ No newline at end of file diff --git a/src/constants.h b/src/constants.h index 3575e196..ce636b15 100644 --- a/src/constants.h +++ b/src/constants.h @@ -7,6 +7,9 @@ #define NAMESPACE_SEPARATOR_CHAR "|" #define NAMESPACE_SEPARATOR_CHAR_LEN strlen(NAMESPACE_SEPARATOR_CHAR) +#define LANGUAGE_SEPARATOR_CHAR "|" +#define LANGUAGE_SEPARATOR_CHAR_LEN strlen(LANGUAGE_SEPARATOR_CHAR) + // Supports ISO 639 alpha 2 and alpha 3 codes #define MAX_LANGUAGE_LEN 4