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_sphinxaot.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_sphinxaot.cpp')
| -rw-r--r-- | textproc/sphinxsearch/files/patch-src_sphinxaot.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/textproc/sphinxsearch/files/patch-src_sphinxaot.cpp b/textproc/sphinxsearch/files/patch-src_sphinxaot.cpp new file mode 100644 index 000000000000..8688e447a034 --- /dev/null +++ b/textproc/sphinxsearch/files/patch-src_sphinxaot.cpp @@ -0,0 +1,11 @@ +--- src/sphinxaot.cpp.orig 2018-02-03 10:35:17 UTC ++++ src/sphinxaot.cpp +@@ -1133,7 +1133,7 @@ static inline int Utf8ToWin1251 ( BYTE * pOut, const B + assert ( pWord[1]>=0x80 && pWord[1]<0xC0 ); + + // table index D0 80..BF to 0..3F, and D1 80..BF to 40..7F +- register BYTE uWin = dTable [ ( pWord[1] & 0x7F ) + ( ( pWord[0] & 1 )<<6 ) ]; ++ BYTE uWin = dTable [ ( pWord[1] & 0x7F ) + ( ( pWord[0] & 1 )<<6 ) ]; + pWord += 2; + + if ( !uWin ) |