From eef3f9fbd3361880e64957398a8683b6a329c337 Mon Sep 17 00:00:00 2001 From: Thomas Holmes Date: Tue, 12 May 2015 15:47:24 +0100 Subject: [PATCH] MINOR: global: add several 51Degrees members to global These are : fiftyoneDegreesDataSet _51d_data_set char *_51d_data_file_path char _51d_property_seperator struct list _51d_property_names --- include/types/global.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/types/global.h b/include/types/global.h index 0764fc0e05..2203a1f389 100644 --- a/include/types/global.h +++ b/include/types/global.h @@ -32,6 +32,10 @@ #include #include +#ifdef USE_51DEGREES +#include <51Degrees.h> +#endif + #ifndef UNIX_MAX_PATH #define UNIX_MAX_PATH 108 #endif @@ -180,8 +184,22 @@ struct global { char separator; } deviceatlas; #endif + +#ifdef USE_51DEGREES + fiftyoneDegreesDataSet _51d_data_set; + char * _51d_data_file_path; /* the path of the data file. this is taken from 51degrees-data-file in config. */ + char _51d_property_seperator; /* the seperator to use in the response for the values. this is taken from 51degrees-property-seperator from config. */ + struct list _51d_property_names; /* list of properties to load into the data set. this is taken from 51degrees-property-name-list from config. */ +#endif }; +#ifdef USE_51DEGREES +struct _51d_property_names { + struct list list; + char *name; +}; +#endif + extern struct global global; extern int pid; /* current process id */ extern int relative_pid; /* process id starting at 1 */ -- 2.47.3