diff options
| author | Matthew Seaman <matthew@FreeBSD.org> | 2018-02-04 09:16:23 +0000 |
|---|---|---|
| committer | Matthew Seaman <matthew@FreeBSD.org> | 2018-02-04 09:16:23 +0000 |
| commit | f074c54f0217028c9244c0d7da2d90625498d3d6 (patch) | |
| tree | cac16ba565ffd0ae8bf218159c646749f37de575 /textproc/sphinxsearch/files/patch-src_sphinxrt.cpp | |
| parent | - Switch to new test framework (diff) | |
Patches to make the code compatible with clang-6.0 / C++17 -- this will
fix the build on FreeBSD 12.0
- delete the 'register' keyword everywhere
- Add whitespace between adjacent quoted strings
- Update the offsetof() macro to cast the result to int
Reported by: pkg-fallout
Notes
Notes:
svn path=/head/; revision=460879
Diffstat (limited to 'textproc/sphinxsearch/files/patch-src_sphinxrt.cpp')
| -rw-r--r-- | textproc/sphinxsearch/files/patch-src_sphinxrt.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/textproc/sphinxsearch/files/patch-src_sphinxrt.cpp b/textproc/sphinxsearch/files/patch-src_sphinxrt.cpp new file mode 100644 index 000000000000..f43460527a00 --- /dev/null +++ b/textproc/sphinxsearch/files/patch-src_sphinxrt.cpp @@ -0,0 +1,11 @@ +--- src/sphinxrt.cpp.orig 2018-02-03 10:48:40 UTC ++++ src/sphinxrt.cpp +@@ -4796,7 +4796,7 @@ int RtIndex_t::DebugCheck ( FILE * fp ) + if ( !tWord.m_uDocs || !tWord.m_uHits || tWord.m_uHits<tWord.m_uDocs ) + { + sWord[sizeof(sWord)-1] = '\0'; +- LOC_FAIL(( fp, "invalid docs/hits (segment=%d, word=%d, read_wordid="UINT64_FMT ++ LOC_FAIL(( fp, "invalid docs/hits (segment=%d, word=%d, read_wordid=" UINT64_FMT + ", read_word=%s, docs=%u, hits=%u)", + iSegment, nWordsRead, (uint64_t)tWord.m_uWordID, + sWord+1, tWord.m_uDocs, tWord.m_uHits )); |