From c73eed433208b93b4457bba249146f162600ad47 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 24 Jan 2011 10:40:37 +0000 Subject: WaE: gcc 4.6.0 various warnings --- libwpd/libwpd.gcc460.patch | 11 +++++++++++ libwpd/makefile.mk | 1 + 2 files changed, 12 insertions(+) create mode 100644 libwpd/libwpd.gcc460.patch (limited to 'libwpd') diff --git a/libwpd/libwpd.gcc460.patch b/libwpd/libwpd.gcc460.patch new file mode 100644 index 000000000000..e5e41a0ddf06 --- /dev/null +++ b/libwpd/libwpd.gcc460.patch @@ -0,0 +1,11 @@ +--- misc/libwpd-0.9.1/src/lib/WP5GraphicsInformationPacket.h 2011-01-24 09:50:48.131106590 +0000 ++++ misc/build/libwpd-0.9.1/src/lib/WP5GraphicsInformationPacket.h 2011-01-24 09:51:17.676174074 +0000 +@@ -37,7 +37,7 @@ + ~WP5GraphicsInformationPacket(); + void _readContents(WPXInputStream *input, WPXEncryption *encryption, uint32_t dataSize); + const std::vector &getImages() const { return m_images; } +- const WPXBinaryData *getImage( unsigned long imageIndex ) const { if (imageIndex < m_images.size()) return m_images[imageIndex]; return NULL; } ++ const WPXBinaryData *getImage( unsigned long imageIndex ) const { if (imageIndex < m_images.size()) return m_images[imageIndex]; return 0; } + + private: + std::vector m_images; diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk index 6ea63b1cf016..40b186d0147e 100644 --- a/libwpd/makefile.mk +++ b/libwpd/makefile.mk @@ -43,6 +43,7 @@ TARGET=wpd TARFILE_NAME=libwpd-0.9.1 TARFILE_MD5=5ff846847dab351604ad859e2fd4ed3c +PATCH_FILES=libwpd.gcc460.patch BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src$/lib -- cgit