Want more features on Pastebin? Sign Up, it's FREE!
Guest

json-c.patch

By: a guest on May 28th, 2014  |  syntax: Diff  |  size: 0.99 KB  |  views: 227  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff --git a/cmake/Modules/FindJSONC.cmake b/cmake/Modules/FindJSONC.cmake
  2. index f72e8ea..8e4f1fc 100644
  3. --- a/cmake/Modules/FindJSONC.cmake
  4. +++ b/cmake/Modules/FindJSONC.cmake
  5. @@ -6,8 +6,8 @@
  6.  #  JSONC_INCLUDE_DIR - The JSON-C include directory.
  7.  #  JSONC_LIBRARY     - The JSON-C library to link against.
  8.  
  9. -FIND_PATH(JSONC_INCLUDE_DIR json/json.h)
  10. -FIND_LIBRARY(JSONC_LIBRARY NAMES json)
  11. +FIND_PATH(JSONC_INCLUDE_DIR json-c/json.h)
  12. +FIND_LIBRARY(JSONC_LIBRARY NAMES json-c)
  13.  
  14.  IF (JSONC_INCLUDE_DIR AND JSONC_LIBRARY)
  15.     SET(JSONC_FOUND TRUE)
  16. diff --git a/libgrive/src/protocol/Json.cc b/libgrive/src/protocol/Json.cc
  17. index 4c115d6..a7f0373 100644
  18. --- a/libgrive/src/protocol/Json.cc
  19. +++ b/libgrive/src/protocol/Json.cc
  20. @@ -29,8 +29,8 @@
  21.         #pragma warning(push)
  22.         #pragma warning(disable: 4005)
  23.  #endif
  24. -#include <json/json_tokener.h>
  25. -#include <json/linkhash.h>
  26. +#include <json-c/json_tokener.h>
  27. +#include <json-c/linkhash.h>
  28.  #ifdef _MSC_VER
  29.         #pragma warning(pop)
  30.  #endif
clone this paste RAW Paste Data