369cb79a99
sberg says: On Windows, implicit --enable-extras first causes a build breaker in workdir/UnpackedTarball/icu/source/extras/scrptrun when linking, because Windows link.exe doesn't understand -o. But even with a patch > --- source/extra/scrptrun/Makefile.in > +++ source/extra/scrptrun/Makefile.in > @@ -74,7 +74,7 @@ > && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status > > $(TARGET) : $(OBJECTS) > - $(LINK.cc) -o $@ $^ $(LIBS) > + $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) > $(POST_BUILD_STEP) > > invoke: linking would still fail with a missing ../../lib/icuucdd.lib, which is apparently expanded from $(LIBS) there, but I have no idea where it should be built but isn't. Lets hope that --disable-extras is sufficient for our needs. Change-Id: I6d0117b230caa41abf488fcd069028e3474700f8 Reviewed-on: https://gerrit.libreoffice.org/81632 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
11 lines
450 B
Groff
11 lines
450 B
Groff
diff -ur icu.org/source/common/unicode/utf16.h icu/source/common/unicode/utf16.h
|
|
--- icu.org/source/common/unicode/utf16.h 2019-10-03 13:16:41.000000000 +0200
|
|
+++ icu/source/common/unicode/utf16.h 2019-10-28 18:03:07.967208272 +0100
|
|
@@ -397,6 +397,7 @@
|
|
(s)[(i)++]=(uint16_t)(((c)&0x3ff)|0xdc00); \
|
|
} else /* c>0x10ffff or not enough space */ { \
|
|
(isError)=TRUE; \
|
|
+ (void)(isError); \
|
|
} \
|
|
} UPRV_BLOCK_MACRO_END
|
|
|