blob: c7739ad441cb082632ef76ef1c7c2b6e833fc88b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
--- misc/graphite2-1.2.0/include/graphite2/Types.h 2011-02-12 16:54:16.000000000 +0100
+++ misc/build/graphite2-1.2.0/include/graphite2/Types.h 2011-03-15 21:38:06.264788098 +0100
@@ -41,7 +41,8 @@
};
// Definitions for library publicly exported symbols
-#if defined _WIN32 || defined __CYGWIN__
+#define GR2_STATIC 1
+#if ( defined _WIN32 || defined __CYGWIN__ ) && !defined GR2_STATIC
#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 ()
{
|
