diff options
| author | Michał Cichoń <michcic@gmail.com> | 2015-08-25 19:58:37 +0200 |
|---|---|---|
| committer | Michał Cichoń <michcic@gmail.com> | 2015-08-25 19:58:37 +0200 |
| commit | a68df043bfbc7f8f38332143577877846631eca4 (patch) | |
| tree | bf0e892f6e6df291111536e5db14982c834efe13 /json-c/src/json_inttypes.h | |
| parent | 62c78119f83d76661ded8c852ac42c3b9330d211 (diff) | |
| download | pianobar-windows-build-a68df043bfbc7f8f38332143577877846631eca4.tar.gz pianobar-windows-build-a68df043bfbc7f8f38332143577877846631eca4.tar.bz2 pianobar-windows-build-a68df043bfbc7f8f38332143577877846631eca4.zip | |
Update build environment
- remove faad2
- remove mad
- remove polarssl
- remove pthreads
- add libcurl
- add vtparse with UTF8 support
- update project to use Visual Studio 2015
Diffstat (limited to 'json-c/src/json_inttypes.h')
| -rw-r--r-- | json-c/src/json_inttypes.h | 51 |
1 files changed, 19 insertions, 32 deletions
diff --git a/json-c/src/json_inttypes.h b/json-c/src/json_inttypes.h index d34b11b..17667f0 100644 --- a/json-c/src/json_inttypes.h +++ b/json-c/src/json_inttypes.h @@ -1,32 +1,19 @@ - -#ifndef _json_inttypes_h_ -#define _json_inttypes_h_ - -#include "json_config.h" - -#if defined(_MSC_VER) && _MSC_VER >= 1600 - -/* Anything less than Visual Studio C++ 10 is missing stdint.h and inttypes.h */ -/* -typedef __int32 int32_t; -#define INT32_MIN ((int32_t)_I32_MIN) -#define INT32_MAX ((int32_t)_I32_MAX) -typedef __int64 int64_t; -#define INT64_MIN ((int64_t)_I64_MIN) -#define INT64_MAX ((int64_t)_I64_MAX) -*/ -#define PRId64 "I64d" -#define SCNd64 "I64d" - -#include <stdint.h> - -#else - -#ifdef JSON_C_HAVE_INTTYPES_H -#include <inttypes.h> -#endif -/* inttypes.h includes stdint.h */ - -#endif - -#endif +
+#ifndef _json_inttypes_h_
+#define _json_inttypes_h_
+
+#include "json_config.h"
+
+#ifdef JSON_C_HAVE_INTTYPES_H
+/* inttypes.h includes stdint.h */
+#include <inttypes.h>
+
+#else
+#include <stdint.h>
+
+#define PRId64 "I64d"
+#define SCNd64 "I64d"
+
+#endif
+
+#endif
|