diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2015-05-28 11:29:47 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2015-05-28 11:29:47 -0300 |
| commit | fcb2d26cfa3b265200b5ae9e949d787a56bd4f14 (patch) | |
| tree | 60bf5147d7608e6217b37e6807c386b3a43a2b36 /pcr/libubox-lua-git/002-json-c-include.patch | |
| parent | 19fe7e7da672746eea0c2cae0307cea5e54fb23e (diff) | |
| parent | b0bb663657922f0154dd8d60a6d5455f9a2bfe3c (diff) | |
| download | abslibre-fcb2d26cfa3b265200b5ae9e949d787a56bd4f14.tar.gz abslibre-fcb2d26cfa3b265200b5ae9e949d787a56bd4f14.tar.bz2 abslibre-fcb2d26cfa3b265200b5ae9e949d787a56bd4f14.zip | |
Merge branch 'master' of git://projects.parabola.nu/abslibre/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> |