diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2013-03-21 20:20:28 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2013-03-21 20:21:31 +0200 |
| commit | cd9c754828eb4f63373463399d7a41aa9ca43459 (patch) | |
| tree | 358c40849689649dfc7e00aeadc174f16096b99f /graphite | |
| parent | 8b79f292fb7f41f424c4f02900082a5c9a71c0f4 (diff) | |
64-bit Windows size_t and ptrdiff_t fix
Change-Id: If52ea2777af1faca3ea20a7bd305307ab0c115ac
Diffstat (limited to 'graphite')
| -rw-r--r-- | graphite/graphite2.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/graphite/graphite2.patch b/graphite/graphite2.patch index 2b6f64b7b0b1..c7739ad441cb 100644 --- a/graphite/graphite2.patch +++ b/graphite/graphite2.patch @@ -10,3 +10,20 @@ #if defined GRAPHITE2_STATIC #define GR2_API #elif defined GRAPHITE2_EXPORTING +--- misc/graphite2-1.2.0/src/inc/json.h ++++ misc/build/graphite2-1.2.0/src/inc/json.h +@@ -146,6 +146,14 @@ + inline + json & operator << (json & j, unsigned int d) throw() { return j << json::integer(d); } + ++#if defined(_WIN64) ++inline ++json & operator << (json & j, __int64 d) throw() { return j << json::integer((unsigned int)d); } ++ ++inline ++json & operator << (json & j, size_t d) throw() { return j << json::integer((unsigned int)d); } ++ ++#endif + inline + json & operator << (json & j, char c) throw () + { |