[config] config.h=>libpostal_config.h so as not to conflict with autoconf

This commit is contained in:
Al
2015-08-06 17:49:35 -04:00
parent 2bedb695a2
commit 61d586fa1d
5 changed files with 10 additions and 8 deletions

View File

@@ -11,7 +11,7 @@ extern "C" {
#include <string.h>
#include "address_expansion_rule.h"
#include "config.h"
#include "libpostal_config.h"
#include "constants.h"
#include "collections.h"
#include "file_utils.h"

View File

@@ -9,7 +9,7 @@ extern "C" {
#include <stdlib.h>
#include "bloom.h"
#include "config.h"
#include "libpostal_config.h"
#include "geonames.h"
#include "sparkey/sparkey.h"
#include "sparkey/sparkey-internal.h"

View File

@@ -7,7 +7,7 @@
#include "sparkey/sparkey.h"
#include "collections.h"
#include "config.h"
#include "libpostal_config.h"
#include "file_utils.h"
#include "gazetteers.h"
#include "geonames.h"

View File

@@ -1,9 +1,11 @@
#ifndef CONFIG_H
#define CONFIG_H
#ifndef LIBPOSTAL_PATHS_H
#define LIBPOSTAL_PATHS_H
#include "file_utils.h"
#define LIBPOSTAL_DATA_DIR ".." PATH_SEPARATOR "data"
#ifndef LIBPOSTAL_DATA_DIR
#error LIBPOSTAL_DATA_DIR not defined!
#endif
#define LIBPOSTAL_DICTIONARIES_DIR LIBPOSTAL_DATA_DIR PATH_SEPARATOR "dictionaries"
#define LIBPOSTAL_GEONAMES_DIR LIBPOSTAL_DATA_DIR PATH_SEPARATOR "geonames"

View File

@@ -13,7 +13,7 @@ extern "C" {
#include <inttypes.h>
#include "collections.h"
#include "config.h"
#include "libpostal_config.h"
#include "constants.h"
#include "klib/khash.h"
#include "string_utils.h"