Fossil

Changes On Branch 64bit-int-on-win
Login

Changes On Branch 64bit-int-on-win

Hide Diff Patch Unified Diff

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Changes In Branch 64bit-int-on-win Excluding Merge-Ins

This is equivalent to a diff from fded1d055f to 50e8847df7

2013-06-20
13:34
Allow 64-bit integers to be used in JSON on win32/win64. ... (check-in: 928b26ab6a user: jan.nijtmans tags: trunk)
13:22
Allow 64-bit integers to be used in JSON on win32/64 ... (Closed-Leaf check-in: 50e8847df7 user: jan.nijtmans tags: 64bit-int-on-win)
13:18
Fixed modulo/divide by 0 in TH1, per ML bug report from Eduardo Morras. ... (check-in: fded1d055f user: stephan tags: trunk)
11:46
Enhance the "fossil extra" and "fossil clean" commands to restrict output to files and directories named on the command-line. Enhancement request ticket [967cedbf200f7]. ... (check-in: 39feb8926e user: drh tags: trunk)

Changes to src/cson_amalgamation.c.

︙︙
24
25
26
27
28
29
30




31
32
33
34
35
36
37
38

#	    define JSON_PARSER_DLL_API 
#   endif
#else
#	define JSON_PARSER_DLL_API 
#endif

/* Determine the integer type use to parse non-floating point numbers */




#if __STDC_VERSION__ >= 199901L || HAVE_LONG_LONG == 1
typedef long long JSON_int_t;
#define JSON_PARSER_INTEGER_SSCANF_TOKEN "%lld"
#define JSON_PARSER_INTEGER_SPRINTF_TOKEN "%lld"
#else 
typedef long JSON_int_t;
#define JSON_PARSER_INTEGER_SSCANF_TOKEN "%ld"
#define JSON_PARSER_INTEGER_SPRINTF_TOKEN "%ld"








>
>
>
>
|








24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42

#	    define JSON_PARSER_DLL_API 
#   endif
#else
#	define JSON_PARSER_DLL_API 
#endif

/* Determine the integer type use to parse non-floating point numbers */
#ifdef _WIN32
typedef __int64 JSON_int_t;
#define JSON_PARSER_INTEGER_SSCANF_TOKEN "%I64d"
#define JSON_PARSER_INTEGER_SPRINTF_TOKEN "%I64d"
#elif (__STDC_VERSION__ >= 199901L) || (HAVE_LONG_LONG == 1)
typedef long long JSON_int_t;
#define JSON_PARSER_INTEGER_SSCANF_TOKEN "%lld"
#define JSON_PARSER_INTEGER_SPRINTF_TOKEN "%lld"
#else 
typedef long JSON_int_t;
#define JSON_PARSER_INTEGER_SSCANF_TOKEN "%ld"
#define JSON_PARSER_INTEGER_SPRINTF_TOKEN "%ld"
︙︙

Changes to src/cson_amalgamation.h.

︙︙
49
50
51
52
53
54
55




56
57
58
59
60
61
62
63



/** @typedef some_long_int_type cson_int_t

Typedef for JSON-like integer types. This is (long long) where feasible,
otherwise (long).
*/




#if (__STDC_VERSION__ >= 199901L) || (HAVE_LONG_LONG == 1)
typedef long long cson_int_t;
#define CSON_INT_T_SFMT "lld"
#define CSON_INT_T_PFMT "lld"
#else 
typedef long cson_int_t;
#define CSON_INT_T_SFMT "ld"
#define CSON_INT_T_PFMT "ld"








>
>
>
>
|








49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67



/** @typedef some_long_int_type cson_int_t

Typedef for JSON-like integer types. This is (long long) where feasible,
otherwise (long).
*/
#ifdef _WIN32
typedef __int64 cson_int_t;
#define CSON_INT_T_SFMT "I64d"
#define CSON_INT_T_PFMT "I64d"
#elif (__STDC_VERSION__ >= 199901L) || (HAVE_LONG_LONG == 1)
typedef long long cson_int_t;
#define CSON_INT_T_SFMT "lld"
#define CSON_INT_T_PFMT "lld"
#else 
typedef long cson_int_t;
#define CSON_INT_T_SFMT "ld"
#define CSON_INT_T_PFMT "ld"
︙︙