skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Fix support for building without MPW_JSON enabled.

Browse Source
This commit is contained in:
Maarten Billemont 2017-09-06 00:32:50 -04:00
parent 4f552be5a9
commit 30fdb54e94
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/c/mpw-marshall-util.h
View File

@ -20,7 +20,9 @@
#define _MPW_MARSHALL_UTIL_H #define _MPW_MARSHALL_UTIL_H
#include <time.h> #include <time.h>
#if MPW_JSON
#include "json-c/json.h" #include "json-c/json.h"
#endif
#include "mpw-algorithm.h" #include "mpw-algorithm.h"
@ -37,6 +39,7 @@ time_t mpw_mktime(
/// JSON parsing. /// JSON parsing.
#if MPW_JSON
/** Search for a JSON child object in a JSON object tree. /** Search for a JSON child object in a JSON object tree.
* @param section A dot-delimited list of JSON object keys to walk toward the child object. * @param section A dot-delimited list of JSON object keys to walk toward the child object.
* @return A new JSON object or NULL if one of the section's object keys was not found in the source object's tree. */ * @return A new JSON object or NULL if one of the section's object keys was not found in the source object's tree. */
@ -57,6 +60,7 @@ int64_t mpw_get_json_int(
* @return The boolean value or defaultValue if one of the section's object keys was not found in the source object's tree. */ * @return The boolean value or defaultValue if one of the section's object keys was not found in the source object's tree. */
bool mpw_get_json_boolean( bool mpw_get_json_boolean(
json_object *obj, const char *section, bool defaultValue); json_object *obj, const char *section, bool defaultValue);
#endif
/// mpw. /// mpw.

4
core/c/mpw-marshall.h
View File

@ -33,7 +33,11 @@ typedef mpw_enum( unsigned int, MPMarshallFormat ) {
/** Generate a name for identification. */ /** Generate a name for identification. */
MPMarshallFormatJSON, MPMarshallFormatJSON,
#if MPW_JSON
MPMarshallFormatDefault = MPMarshallFormatJSON, MPMarshallFormatDefault = MPMarshallFormatJSON,
#else
MPMarshallFormatDefault = MPMarshallFormatFlat,
#endif
}; };
typedef mpw_enum( unsigned int, MPMarshallErrorType ) { typedef mpw_enum( unsigned int, MPMarshallErrorType ) {