freebsd-ports/textproc/sphinxsearch/files/patch-src_sphinxstemru.inl
Matthew Seaman f074c54f02 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
2018-02-04 09:16:23 +00:00

21 lines
764 B
C++

--- src/sphinxstemru.inl.orig 2018-02-03 14:10:20 UTC
+++ src/sphinxstemru.inl
@@ -413,7 +413,7 @@ STEM_RU_FUNC_I(ru_noun)
static int LOC_PREFIX(stem_ru_adjectival) ( LOC_CHAR_TYPE * word, int len )
{
- register int i = LOC_PREFIX(stem_ru_adj_i) ( word, len );
+ int i = LOC_PREFIX(stem_ru_adj_i) ( word, len );
if ( i )
i += LOC_PREFIX(stem_ru_part_i) ( word, len-i );
return i;
@@ -422,7 +422,7 @@ static int LOC_PREFIX(stem_ru_adjectival) ( LOC_CHAR_T
static int LOC_PREFIX(stem_ru_verb_ov) ( LOC_CHAR_TYPE * word, int len )
{
- register int i = LOC_PREFIX(stem_ru_verb_i) ( word, len );
+ int i = LOC_PREFIX(stem_ru_verb_i) ( word, len );
if ( i && (len>=i+2) && word[len-i-2] == RUS::O && word[len-i-1] == RUS::V )
return i+2;
return i;