Bump version to 5.0-14
[LibreOffice.git] / external / clucene / patches / clucene-git1-win64.patch
blobdc07d380bb45193a5c32aa4a5e71f706a857ca40
1 --- src/shared/CLucene/config/threads.cpp 2013-06-06 16:25:23.014622397 +0200
2 +++ src/shared/CLucene/config/threads.cpp 2013-06-06 16:33:35.326048842 +0200
3 @@ -63,14 +63,14 @@
6 int32_t mutex_thread::atomic_increment(_LUCENE_ATOMIC_INT *theInteger){
7 -#ifdef _M_X64
8 +#ifdef _WIN64
9 return _InterlockedIncrement64(theInteger);
10 #else
11 return InterlockedIncrement(theInteger);
12 #endif
14 int32_t mutex_thread::atomic_decrement(_LUCENE_ATOMIC_INT *theInteger){
15 -#ifdef _M_X64
16 +#ifdef _WIN64
17 return _InterlockedDecrement64(theInteger);
18 #else
19 return InterlockedDecrement(theInteger);
20 --- src/shared/CLucene/config/_threads.h 2013-06-06 16:25:23.013622420 +0200
21 +++ src/shared/CLucene/config/_threads.h 2013-06-06 16:29:39.152601408 +0200
22 @@ -34,9 +34,9 @@
24 __declspec(dllimport) unsigned long __stdcall GetCurrentThreadId();
26 -#ifdef _M_X64
27 - __declspec(dllimport) long long __stdcall _InterlockedIncrement64(__inout long long volatile*);
28 - __declspec(dllimport) long long __stdcall _InterlockedDecrement64(__inout long long volatile*);
29 +#ifdef _WIN64
30 + long long __stdcall _InterlockedIncrement64(long long volatile*);
31 + long long __stdcall _InterlockedDecrement64(long long volatile*);
32 #else
33 __declspec(dllimport) long __stdcall InterlockedIncrement(long volatile*);
34 __declspec(dllimport) long __stdcall InterlockedDecrement(long volatile*);
35 --- src/shared/CLucene/LuceneThreads.h 2013-06-06 16:25:23.014622397 +0200
36 +++ src/shared/CLucene/LuceneThreads.h 2013-06-06 16:37:45.490166481 +0200
37 @@ -101,7 +101,7 @@
39 #define _LUCENE_ATOMIC_INC(theInteger) CL_NS(util)::mutex_thread::atomic_increment(theInteger)
40 #define _LUCENE_ATOMIC_DEC(theInteger) CL_NS(util)::mutex_thread::atomic_decrement(theInteger)
41 -#ifdef _M_X64
42 +#ifdef _WIN64
43 #define _LUCENE_ATOMIC_INT long long
44 #else
45 #define _LUCENE_ATOMIC_INT long