]>
Commit | Line | Data |
---|---|---|
24a2a94f JB |
1 | --- harfbuzz-1.1.3/src/hb-uniscribe.cc.orig 2016-01-06 13:29:29.337284954 +0100 |
2 | +++ harfbuzz-1.1.3/src/hb-uniscribe.cc 2016-01-12 17:19:29.371811035 +0100 | |
3 | @@ -42,6 +42,9 @@ | |
4 | #define HB_DEBUG_UNISCRIBE (HB_DEBUG+0) | |
5 | #endif | |
6 | ||
7 | +#ifndef E_NOT_SUFFICIENT_BUFFER | |
8 | +#define E_NOT_SUFFICIENT_BUFFER ((HRESULT)0x8007007A) | |
9 | +#endif | |
10 | ||
11 | static inline uint16_t hb_uint16_swap (const uint16_t v) | |
12 | { return (v >> 8) | (v << 8); } | |
4abaa9c0 JB |
13 | --- harfbuzz-1.4.5/src/hb-atomic-private.hh.orig 2016-07-13 04:09:47.000000000 +0200 |
14 | +++ harfbuzz-1.4.5/src/hb-atomic-private.hh 2017-04-09 14:28:37.769359459 +0200 | |
15 | @@ -67,7 +67,7 @@ | |
16 | #define hb_atomic_int_impl_add(AI, V) InterlockedExchangeAdd (&(AI), (V)) | |
17 | ||
18 | #define hb_atomic_ptr_impl_get(P) (_HBMemoryBarrier (), (void *) *(P)) | |
19 | -#define hb_atomic_ptr_impl_cmpexch(P,O,N) (InterlockedCompareExchangePointer ((void **) (P), (void *) (N), (void *) (O)) == (void *) (O)) | |
20 | +#define hb_atomic_ptr_impl_cmpexch(P,O,N) (((void*)InterlockedCompareExchange((long volatile*)(void **) (P), (long)(void *) (N), (long)(void *) (O))) == (void *) (O)) | |
21 | ||
22 | ||
23 | #elif !defined(HB_NO_MT) && defined(__APPLE__) | |
6155f209 JB |
24 | --- harfbuzz-1.7.6/src/hb-private.hh.orig 2018-02-18 20:36:12.000000000 +0100 |
25 | +++ harfbuzz-1.7.6/src/hb-private.hh 2018-03-14 18:34:31.433228662 +0100 | |
26 | @@ -51,7 +51,7 @@ | |
27 | #include <stdio.h> | |
28 | #include <stdarg.h> | |
29 | ||
30 | -#if defined(_MSC_VER) || defined(__MINGW32__) | |
31 | +#if defined(_MSC_VER) | |
32 | #include <intrin.h> | |
33 | #endif | |
34 | ||
35 | @@ -380,7 +380,7 @@ | |
36 | return sizeof (unsigned long long) * 8 - __builtin_clzll (v); | |
37 | #endif | |
38 | ||
39 | -#if defined(_MSC_VER) || defined(__MINGW32__) | |
40 | +#if defined(_MSC_VER) | |
41 | if (sizeof (T) <= sizeof (unsigned int)) | |
42 | { | |
43 | unsigned long where; | |
44 | @@ -453,7 +453,7 @@ | |
45 | return __builtin_ctzll (v); | |
46 | #endif | |
47 | ||
48 | -#if defined(_MSC_VER) || defined(__MINGW32__) | |
49 | +#if defined(_MSC_VER) | |
50 | if (sizeof (T) <= sizeof (unsigned int)) | |
51 | { | |
52 | unsigned long where; |