diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-01-24 10:40:37 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-24 10:44:45 +0000 |
| commit | c73eed433208b93b4457bba249146f162600ad47 (patch) | |
| tree | 1796f6b0e6bc1f5961a75bec7c9697e4356566ff /libwpd | |
| parent | 7640c5d1cae26fd31a6099f66d3199f5e3286fb8 (diff) | |
WaE: gcc 4.6.0 various warnings
Diffstat (limited to 'libwpd')
| -rw-r--r-- | libwpd/libwpd.gcc460.patch | 11 | ||||
| -rw-r--r-- | libwpd/makefile.mk | 1 |
2 files changed, 12 insertions, 0 deletions
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<WPXBinaryData *> &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<WPXBinaryData *> 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 |