diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-04-10 11:24:59 -0500 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-04-10 20:22:35 +0100 |
| commit | c0c96884208aadf66e4219000e1f8384b1cb20fd (patch) | |
| tree | 4c6e69f2511fab8f52039cae738fa197eb6ed03c /clucene | |
| parent | 858c6610f3476bb47bb7b4e621a7ac48a9e34a75 (diff) | |
workaround #define of open
on aix with gcc
Change-Id: I704890cfae64343937cba8cc9206e493542baae3
Diffstat (limited to 'clucene')
| -rw-r--r-- | clucene/UnpackedTarball_clucene.mk | 1 | ||||
| -rw-r--r-- | clucene/patches/clucene-aix.patch | 40 |
2 files changed, 41 insertions, 0 deletions
diff --git a/clucene/UnpackedTarball_clucene.mk b/clucene/UnpackedTarball_clucene.mk index 5b53226721e8..6a326984b5ad 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-narrowing-conversions.patch \ clucene/patches/clucene-nullptr.patch \ clucene/patches/clucene-warnings.patch \ + clucene/patches/clucene-aix.patch \ )) ifeq ($(OS),WNT) diff --git a/clucene/patches/clucene-aix.patch b/clucene/patches/clucene-aix.patch new file mode 100644 index 000000000000..2b796fa45bdc --- /dev/null +++ b/clucene/patches/clucene-aix.patch @@ -0,0 +1,40 @@ +diff -rc clucene.orig/src/core/CLucene/store/MMapInput.cpp clucene/src/core/CLucene/store/MMapInput.cpp +*** src/core/CLucene/store/MMapInput.cpp Wed Apr 10 10:57:37 2013 +--- src/core/CLucene/store/MMapInput.cpp Wed Apr 10 10:58:30 2013 +*************** +*** 115,121 **** + { + } + +! bool MMapIndexInput::open(const char* path, IndexInput*& ret, CLuceneError& error, int32_t __bufferSize ) { + + //Func - Constructor. + // Opens the file named path +--- 115,121 ---- + { + } + +! bool MMapIndexInput::Open(const char* path, IndexInput*& ret, CLuceneError& error, int32_t __bufferSize ) { + + //Func - Constructor. + // Opens the file named path +diff -rc clucene.orig/src/core/CLucene/store/_MMapIndexInput.h clucene/src/core/CLucene/store/_MMapIndexInput.h +*** src/core/CLucene/store/_MMapIndexInput.h Wed Apr 10 10:57:37 2013 +--- src/core/CLucene/store/_MMapIndexInput.h Wed Apr 10 10:58:53 2013 +*************** +*** 18,24 **** + MMapIndexInput(const MMapIndexInput& clone); + MMapIndexInput(Internal* _internal); + public: +! static bool open(const char* path, IndexInput*& ret, CLuceneError& error, int32_t __bufferSize); + + ~MMapIndexInput(); + IndexInput* clone() const; +--- 18,24 ---- + MMapIndexInput(const MMapIndexInput& clone); + MMapIndexInput(Internal* _internal); + public: +! static bool Open(const char* path, IndexInput*& ret, CLuceneError& error, int32_t __bufferSize); + + ~MMapIndexInput(); + IndexInput* clone() const; |