Merge pull request #11 from cdunn2001/inc

improve some includes
This commit is contained in:
Christopher Dunn 2014-07-09 21:53:40 -07:00
commit 655a9db0cc
3 changed files with 2 additions and 15 deletions

1
.gitignore vendored
View File

@ -10,3 +10,4 @@
/libs/
/doc/doxyfile
/dist/
/include/json/version.h

View File

@ -9,7 +9,7 @@
#include <stdlib.h>
#if !defined(JSON_IS_AMALGAMATION)
#include <json/config.h>
#include "config.h"
#endif // if !defined(JSON_IS_AMALGAMATION)
#if JSON_USE_EXCEPTION

View File

@ -1,14 +0,0 @@
// DO NOT EDIT. This file is generated by CMake from "version"
// and "version.h.in" files.
// Run CMake configure step to update it.
#ifndef JSON_VERSION_H_INCLUDED
# define JSON_VERSION_H_INCLUDED
# define JSONCPP_VERSION_STRING "0.6.0-dev"
# define JSONCPP_VERSION_MAJOR 0
# define JSONCPP_VERSION_MINOR 6
# define JSONCPP_VERSION_PATCH 0
# define JSONCPP_VERSION_QUALIFIER -dev
# define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8))
#endif // JSON_VERSION_H_INCLUDED