Couldn't find wdiff. Falling back to builtin diff colouring...
| libconfig.h | | libconfig.h | |
| | | | |
| skipping to change at line 44 | | skipping to change at line 44 | |
| #define LIBCONFIG_API __declspec(dllexport) | | #define LIBCONFIG_API __declspec(dllexport) | |
| #else /* ! LIBCONFIG_EXPORTS */ | | #else /* ! LIBCONFIG_EXPORTS */ | |
| #define LIBCONFIG_API __declspec(dllimport) | | #define LIBCONFIG_API __declspec(dllimport) | |
| #endif /* LIBCONFIG_STATIC */ | | #endif /* LIBCONFIG_STATIC */ | |
| #else /* ! WIN32 */ | | #else /* ! WIN32 */ | |
| #define LIBCONFIG_API | | #define LIBCONFIG_API | |
| #endif /* WIN32 */ | | #endif /* WIN32 */ | |
| | | | |
| #define LIBCONFIG_VER_MAJOR 1 | | #define LIBCONFIG_VER_MAJOR 1 | |
| #define LIBCONFIG_VER_MINOR 4 | | #define LIBCONFIG_VER_MINOR 4 | |
|
| #define LIBCONFIG_VER_REVISION 5 | | #define LIBCONFIG_VER_REVISION 6 | |
| | | | |
| #include <stdio.h> | | #include <stdio.h> | |
| | | | |
| #define CONFIG_TYPE_NONE 0 | | #define CONFIG_TYPE_NONE 0 | |
| #define CONFIG_TYPE_GROUP 1 | | #define CONFIG_TYPE_GROUP 1 | |
| #define CONFIG_TYPE_INT 2 | | #define CONFIG_TYPE_INT 2 | |
| #define CONFIG_TYPE_INT64 3 | | #define CONFIG_TYPE_INT64 3 | |
| #define CONFIG_TYPE_FLOAT 4 | | #define CONFIG_TYPE_FLOAT 4 | |
| #define CONFIG_TYPE_STRING 5 | | #define CONFIG_TYPE_STRING 5 | |
| #define CONFIG_TYPE_BOOL 6 | | #define CONFIG_TYPE_BOOL 6 | |
| | | | |
| skipping to change at line 107 | | skipping to change at line 107 | |
| unsigned int length; | | unsigned int length; | |
| config_setting_t **elements; | | config_setting_t **elements; | |
| } config_list_t; | | } config_list_t; | |
| | | | |
| typedef struct config_t | | typedef struct config_t | |
| { | | { | |
| config_setting_t *root; | | config_setting_t *root; | |
| void (*destructor)(void *); | | void (*destructor)(void *); | |
| unsigned short flags; | | unsigned short flags; | |
| unsigned short tab_width; | | unsigned short tab_width; | |
|
| | | const char *include_dir; | |
| const char *error_text; | | const char *error_text; | |
| const char *error_file; | | const char *error_file; | |
| int error_line; | | int error_line; | |
| config_error_t error_type; | | config_error_t error_type; | |
| const char **filenames; | | const char **filenames; | |
| unsigned int num_filenames; | | unsigned int num_filenames; | |
| } config_t; | | } config_t; | |
| | | | |
| extern LIBCONFIG_API int config_read(config_t *config, FILE *stream); | | extern LIBCONFIG_API int config_read(config_t *config, FILE *stream); | |
| extern LIBCONFIG_API void config_write(const config_t *config, FILE *stream
); | | extern LIBCONFIG_API void config_write(const config_t *config, FILE *stream
); | |
| | | | |
| skipping to change at line 130 | | skipping to change at line 131 | |
| | | | |
| extern LIBCONFIG_API int config_read_string(config_t *config, const char *s
tr); | | extern LIBCONFIG_API int config_read_string(config_t *config, const char *s
tr); | |
| | | | |
| extern LIBCONFIG_API int config_read_file(config_t *config, | | extern LIBCONFIG_API int config_read_file(config_t *config, | |
| const char *filename); | | const char *filename); | |
| extern LIBCONFIG_API int config_write_file(config_t *config, | | extern LIBCONFIG_API int config_write_file(config_t *config, | |
| const char *filename); | | const char *filename); | |
| | | | |
| extern LIBCONFIG_API void config_set_destructor(config_t *config, | | extern LIBCONFIG_API void config_set_destructor(config_t *config, | |
| void (*destructor)(void *))
; | | void (*destructor)(void *))
; | |
|
| | | extern LIBCONFIG_API void config_set_include_dir(config_t *config, | |
| | | const char *include_dir); | |
| | | | |
| extern LIBCONFIG_API void config_init(config_t *config); | | extern LIBCONFIG_API void config_init(config_t *config); | |
| extern LIBCONFIG_API void config_destroy(config_t *config); | | extern LIBCONFIG_API void config_destroy(config_t *config); | |
| | | | |
| extern LIBCONFIG_API int config_setting_get_int( | | extern LIBCONFIG_API int config_setting_get_int( | |
| const config_setting_t *setting); | | const config_setting_t *setting); | |
| extern LIBCONFIG_API long long config_setting_get_int64( | | extern LIBCONFIG_API long long config_setting_get_int64( | |
| const config_setting_t *setting); | | const config_setting_t *setting); | |
| extern LIBCONFIG_API double config_setting_get_float( | | extern LIBCONFIG_API double config_setting_get_float( | |
| const config_setting_t *setting); | | const config_setting_t *setting); | |
| | | | |
| skipping to change at line 193 | | skipping to change at line 196 | |
| config_setting_t *setting, int idx, int value); | | config_setting_t *setting, int idx, int value); | |
| extern LIBCONFIG_API config_setting_t *config_setting_set_int64_elem( | | extern LIBCONFIG_API config_setting_t *config_setting_set_int64_elem( | |
| config_setting_t *setting, int idx, long long value); | | config_setting_t *setting, int idx, long long value); | |
| extern LIBCONFIG_API config_setting_t *config_setting_set_float_elem( | | extern LIBCONFIG_API config_setting_t *config_setting_set_float_elem( | |
| config_setting_t *setting, int idx, double value); | | config_setting_t *setting, int idx, double value); | |
| extern LIBCONFIG_API config_setting_t *config_setting_set_bool_elem( | | extern LIBCONFIG_API config_setting_t *config_setting_set_bool_elem( | |
| config_setting_t *setting, int idx, int value); | | config_setting_t *setting, int idx, int value); | |
| extern LIBCONFIG_API config_setting_t *config_setting_set_string_elem( | | extern LIBCONFIG_API config_setting_t *config_setting_set_string_elem( | |
| config_setting_t *setting, int idx, const char *value); | | config_setting_t *setting, int idx, const char *value); | |
| | | | |
|
| | | #define /* const char * */ config_get_include_dir(/* const config_t * */ C)
\ | |
| | | ((C)->include_dir) | |
| | | | |
| #define /* int */ config_setting_type(/* const config_setting_t * */ S) \ | | #define /* int */ config_setting_type(/* const config_setting_t * */ S) \ | |
| ((S)->type) | | ((S)->type) | |
| | | | |
| #define /* int */ config_setting_is_group(/* const config_setting_t * */ S)
\ | | #define /* int */ config_setting_is_group(/* const config_setting_t * */ S)
\ | |
| ((S)->type == CONFIG_TYPE_GROUP) | | ((S)->type == CONFIG_TYPE_GROUP) | |
| #define /* int */ config_setting_is_array(/* const config_setting_t * */ S)
\ | | #define /* int */ config_setting_is_array(/* const config_setting_t * */ S)
\ | |
| ((S)->type == CONFIG_TYPE_ARRAY) | | ((S)->type == CONFIG_TYPE_ARRAY) | |
| #define /* int */ config_setting_is_list(/* const config_setting_t * */ S)
\ | | #define /* int */ config_setting_is_list(/* const config_setting_t * */ S)
\ | |
| ((S)->type == CONFIG_TYPE_LIST) | | ((S)->type == CONFIG_TYPE_LIST) | |
| | | | |
| | | | |
End of changes. 4 change blocks. |
| 1 lines changed or deleted | | 7 lines changed or added | |
|
| libconfig.h++ | | libconfig.h++ | |
| | | | |
| skipping to change at line 44 | | skipping to change at line 44 | |
| #define LIBCONFIGXX_API __declspec(dllexport) | | #define LIBCONFIGXX_API __declspec(dllexport) | |
| #else /* ! LIBCONFIGXX_EXPORTS */ | | #else /* ! LIBCONFIGXX_EXPORTS */ | |
| #define LIBCONFIGXX_API __declspec(dllimport) | | #define LIBCONFIGXX_API __declspec(dllimport) | |
| #endif /* LIBCONFIGXX_STATIC */ | | #endif /* LIBCONFIGXX_STATIC */ | |
| #else /* ! WIN32 */ | | #else /* ! WIN32 */ | |
| #define LIBCONFIGXX_API | | #define LIBCONFIGXX_API | |
| #endif /* WIN32 */ | | #endif /* WIN32 */ | |
| | | | |
| #define LIBCONFIGXX_VER_MAJOR 1 | | #define LIBCONFIGXX_VER_MAJOR 1 | |
| #define LIBCONFIGXX_VER_MINOR 4 | | #define LIBCONFIGXX_VER_MINOR 4 | |
|
| #define LIBCONFIGXX_VER_REVISION 5 | | #define LIBCONFIGXX_VER_REVISION 6 | |
| | | | |
| struct config_t; // fwd decl | | struct config_t; // fwd decl | |
| struct config_setting_t; // fwd decl | | struct config_setting_t; // fwd decl | |
| | | | |
| namespace libconfig { | | namespace libconfig { | |
| | | | |
| class LIBCONFIGXX_API ConfigException : public std::exception { }; | | class LIBCONFIGXX_API ConfigException : public std::exception { }; | |
| | | | |
| class Setting; // fwd decl | | class Setting; // fwd decl | |
| | | | |
| | | | |
| skipping to change at line 375 | | skipping to change at line 375 | |
| | | | |
| Config(); | | Config(); | |
| virtual ~Config(); | | virtual ~Config(); | |
| | | | |
| void setAutoConvert(bool flag); | | void setAutoConvert(bool flag); | |
| bool getAutoConvert() const; | | bool getAutoConvert() const; | |
| | | | |
| void setTabWidth(unsigned short width) throw(); | | void setTabWidth(unsigned short width) throw(); | |
| unsigned short getTabWidth() const throw(); | | unsigned short getTabWidth() const throw(); | |
| | | | |
|
| | | void setIncludeDir(const char *includeDir) throw(); | |
| | | const char *getIncludeDir() const throw(); | |
| | | | |
| void read(FILE *stream) throw(ParseException); | | void read(FILE *stream) throw(ParseException); | |
| void write(FILE *stream) const; | | void write(FILE *stream) const; | |
| | | | |
| void readString(const char *str) throw(ParseException); | | void readString(const char *str) throw(ParseException); | |
| inline void readString(const std::string &str) throw(ParseException) | | inline void readString(const std::string &str) throw(ParseException) | |
| { return(readString(str.c_str())); } | | { return(readString(str.c_str())); } | |
| | | | |
| void readFile(const char *filename) throw(FileIOException, ParseException
); | | void readFile(const char *filename) throw(FileIOException, ParseException
); | |
| void writeFile(const char *filename) throw(FileIOException); | | void writeFile(const char *filename) throw(FileIOException); | |
| | | | |
| | | | |
End of changes. 2 change blocks. |
| 1 lines changed or deleted | | 4 lines changed or added | |
|