diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-11-05 08:16:43 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-05-14 14:02:53 +0200 |
| commit | fdbc4995522167cc64b6b9ec3f9d523c75e52511 (patch) | |
| tree | 2948592209d51562e487cfc092e76355806c588f | |
| parent | 7035bb24dd2f925e709ca41241c52fa0aa2e854e (diff) | |
external/libwpd: Missing include for size_t
...as now reported when building with recent trunk GCC/libstdc++ on Linux:
> In file included from WPXContentListener.cpp:26:
> In file included from ./WPXContentListener.h:29:
> ./WPXTable.h:56:31: error: unknown type name 'size_t'; did you mean 'std::size_t'?
> const WPXTableCell *getCell(size_t i, size_t j)
> ^~~~~~
> std::size_t
Change-Id: Ic20240f01c7b0305cb87ababf53a3aaf66072d61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105324
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 8d378abf1de0a47517427c086da26588f846592a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115000
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 524cfb93d4033917ad20c718d538235078d068d5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115503
Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
| -rw-r--r-- | external/libwpd/UnpackedTarball_libwpd.mk | 1 | ||||
| -rw-r--r-- | external/libwpd/include.patch | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/external/libwpd/UnpackedTarball_libwpd.mk b/external/libwpd/UnpackedTarball_libwpd.mk index 8d0227b9379d..eefa9331c8d6 100644 --- a/external/libwpd/UnpackedTarball_libwpd.mk +++ b/external/libwpd/UnpackedTarball_libwpd.mk @@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libwpd)) $(eval $(call gb_UnpackedTarball_add_patches,libwpd,\ external/libwpd/libwpd-vs2013.patch.1 \ $(if $(SYSTEM_REVENGE),,external/libwpd/rpath.patch) \ + external/libwpd/include.patch \ )) ifneq ($(OS),MACOSX) diff --git a/external/libwpd/include.patch b/external/libwpd/include.patch new file mode 100644 index 000000000000..57f52b4b0aa5 --- /dev/null +++ b/external/libwpd/include.patch @@ -0,0 +1,10 @@ +--- src/lib/WPXTable.h ++++ src/lib/WPXTable.h +@@ -36,6 +36,7 @@ + #ifndef _WPXTABLE_H + #define _WPXTABLE_H + ++#include <stddef.h> + #include <vector> + + struct WPXTableCell |