diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-06 19:48:48 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-06 19:49:56 +0200 |
| commit | 9eb4e4dc51a4448d59ee80f39144387c7b3cffaf (patch) | |
| tree | ca154ba2b8c61f87e7d772a4ed58134f6d73375b /clucene | |
| parent | 44c133ef996e32ebdfc9560bcf14b0cd77196a9e (diff) | |
Some more modules at least building with mingw64
Change-Id: I3ea039655aecb7885bb310b1f2c29d66f9f7bb4f
Diffstat (limited to 'clucene')
| -rw-r--r-- | clucene/UnpackedTarball_clucene.mk | 1 | ||||
| -rw-r--r-- | clucene/patches/clucene-git1-win64.patch | 45 |
2 files changed, 46 insertions, 0 deletions
diff --git a/clucene/UnpackedTarball_clucene.mk b/clucene/UnpackedTarball_clucene.mk index 709640f2bfb2..5328bb248434 100644 --- a/clucene/UnpackedTarball_clucene.mk +++ b/clucene/UnpackedTarball_clucene.mk @@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,clucene,\ clucene/patches/clucene-nullptr.patch \ clucene/patches/clucene-warnings.patch \ clucene/patches/clucene-aix.patch \ + clucene/patches/clucene-git1-win64.patch \ )) ifneq ($(OS),WNT) diff --git a/clucene/patches/clucene-git1-win64.patch b/clucene/patches/clucene-git1-win64.patch new file mode 100644 index 000000000000..dc07d380bb45 --- /dev/null +++ b/clucene/patches/clucene-git1-win64.patch @@ -0,0 +1,45 @@ +--- src/shared/CLucene/config/threads.cpp 2013-06-06 16:25:23.014622397 +0200 ++++ src/shared/CLucene/config/threads.cpp 2013-06-06 16:33:35.326048842 +0200 +@@ -63,14 +63,14 @@ + } + + int32_t mutex_thread::atomic_increment(_LUCENE_ATOMIC_INT *theInteger){ +-#ifdef _M_X64 ++#ifdef _WIN64 + return _InterlockedIncrement64(theInteger); + #else + return InterlockedIncrement(theInteger); + #endif + } + int32_t mutex_thread::atomic_decrement(_LUCENE_ATOMIC_INT *theInteger){ +-#ifdef _M_X64 ++#ifdef _WIN64 + return _InterlockedDecrement64(theInteger); + #else + return InterlockedDecrement(theInteger); +--- src/shared/CLucene/config/_threads.h 2013-06-06 16:25:23.013622420 +0200 ++++ src/shared/CLucene/config/_threads.h 2013-06-06 16:29:39.152601408 +0200 +@@ -34,9 +34,9 @@ + + __declspec(dllimport) unsigned long __stdcall GetCurrentThreadId(); + +-#ifdef _M_X64 +- __declspec(dllimport) long long __stdcall _InterlockedIncrement64(__inout long long volatile*); +- __declspec(dllimport) long long __stdcall _InterlockedDecrement64(__inout long long volatile*); ++#ifdef _WIN64 ++ long long __stdcall _InterlockedIncrement64(long long volatile*); ++ long long __stdcall _InterlockedDecrement64(long long volatile*); + #else + __declspec(dllimport) long __stdcall InterlockedIncrement(long volatile*); + __declspec(dllimport) long __stdcall InterlockedDecrement(long volatile*); +--- src/shared/CLucene/LuceneThreads.h 2013-06-06 16:25:23.014622397 +0200 ++++ src/shared/CLucene/LuceneThreads.h 2013-06-06 16:37:45.490166481 +0200 +@@ -101,7 +101,7 @@ + + #define _LUCENE_ATOMIC_INC(theInteger) CL_NS(util)::mutex_thread::atomic_increment(theInteger) + #define _LUCENE_ATOMIC_DEC(theInteger) CL_NS(util)::mutex_thread::atomic_decrement(theInteger) +-#ifdef _M_X64 ++#ifdef _WIN64 + #define _LUCENE_ATOMIC_INT long long + #else + #define _LUCENE_ATOMIC_INT long |