diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-05-22 05:54:33 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-05-22 05:54:33 -0300 |
| commit | 4774a572775b8c44d86bd8696d17d2205a473ac5 (patch) | |
| tree | 4b17743b5e17e171eda55359ed5737da589b6ed9 /pcr/libubox-lua-git/002-json-c-include.patch | |
| parent | 3cc4685abd608cb86ac3beca4501a77e00c6d5be (diff) | |
| parent | 1a4554480341083f8a1240431c12ebe267843ecd (diff) | |
Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre
Diffstat (limited to 'pcr/libubox-lua-git/002-json-c-include.patch')
| -rw-r--r-- | pcr/libubox-lua-git/002-json-c-include.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/pcr/libubox-lua-git/002-json-c-include.patch b/pcr/libubox-lua-git/002-json-c-include.patch new file mode 100644 index 000000000..72b50816f --- /dev/null +++ b/pcr/libubox-lua-git/002-json-c-include.patch @@ -0,0 +1,31 @@ +--- a/blobmsg_json.c ++++ b/blobmsg_json.c +@@ -17,11 +17,7 @@ + #include "blobmsg.h" + #include "blobmsg_json.h" + +-#ifdef JSONC +- #include <json.h> +-#else +- #include <json/json.h> +-#endif ++#include <json-c/json.h> + + bool blobmsg_add_object(struct blob_buf *b, json_object *obj) + { +--- a/jshn.c ++++ b/jshn.c +@@ -13,11 +13,8 @@ + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +-#ifdef JSONC +- #include <json.h> +-#else +- #include <json/json.h> +-#endif ++ ++#include <json-c/json.h> + + #include <string.h> + #include <stdlib.h> |