Skip to content

C
core
Kaydet (Commit) b45834bf authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

WaE: with DEBUG defined 

Change-Id: I2bf950b8ac644c911050ce01282ac988167d28f9
üst db5e8c06
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 0 deletions
libwpd/UnpackedTarball_wpd.mk
Dosyayı görüntüle @ b45834bf
......@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,wpd,\
libwpd/libwpd-0.9.4.patch \
libwpd/libwpd-0.9.4-warning.patch \
libwpd/libwpd-0.9.4-msvc-warning.patch \
libwpd/libwpd-0.9.4-gcc-osldebug2-warning.patch \
))
# libwpd/libwpd-0.9.4-warning.patch: see upstream
# <http://libwpd.git.sourceforge.net/git/gitweb.cgi?p=libwpd/libwpd;a=commit;
......@@ -23,5 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,wpd,\
# <http://libwpd.git.sourceforge.net/git/gitweb.cgi?p=libwpd/libwpd;a=commit;
# h=fb3827aeb5de64ed84eb1140bae9e32e50ca5133> "MSVC warning C4310: cast
# truncates constant value"
# libwpd/libwpd-0.9.4-gcc-osldebug2-warning.patch
# mailed to Fridrich cause there's no apparent way to submit a patch
# vim: set noet sw=4 ts=4:
libwpd/libwpd-0.9.4-gcc-osldebug2-warning.patch 0 → 100644
Dosyayı görüntüle @ b45834bf
--- foo/UnpackedTarball/wpd/src/lib/WP6BoxGroup.cpp 2012-09-12 23:00:03.552693060 +0100
+++ foo/UnpackedTarball/wpd/src/lib/WP6BoxGroup.cpp 2012-09-12 23:00:41.293089947 +0100
@@ -188,7 +188,7 @@
{
long tmpEndOfData = readU16(input, encryption) + input->tell();
#ifdef DEBUG
- uint16_t tmpOverrideFlags = readU16(input, encryption);
+ tmpOverrideFlags = readU16(input, encryption);
#else
readU16(input, encryption);
#endif
@@ -199,7 +199,7 @@
{
long tmpEndOfData = readU16(input, encryption) + input->tell();
#ifdef DEBUG
- uint16_t tmpOverrideFlags = readU16(input, encryption);
+ tmpOverrideFlags = readU16(input, encryption);
#else
readU16(input, encryption);
#endif
@@ -210,7 +210,7 @@
{
long tmpEndOfData = readU16(input, encryption) + input->tell();
#ifdef DEBUG
- uint16_t tmpOverrideFlags = readU16(input, encryption);
+ tmpOverrideFlags = readU16(input, encryption);
#else
readU16(input, encryption);
#endif
@@ -221,7 +221,7 @@
{
long tmpEndOfData = readU16(input, encryption) + input->tell();
#ifdef DEBUG
- uint16_t tmpOverrideFlags = readU16(input, encryption);
+ tmpOverrideFlags = readU16(input, encryption);
#else
readU16(input, encryption);
#endif
@@ -232,7 +232,7 @@
{
long tmpEndOfData = readU16(input, encryption) + input->tell();
#ifdef DEBUG
- uint16_t tmpOverrideFlags = readU16(input, encryption);
+ tmpOverrideFlags = readU16(input, encryption);
#else
readU16(input, encryption);
#endif
@@ -247,7 +247,7 @@
{
long tmpEndOfData = readU16(input, encryption) + input->tell();
#ifdef DEBUG
- uint16_t tmpOverrideFlags = readU16(input, encryption);
+ tmpOverrideFlags = readU16(input, encryption);
#else
readU16(input, encryption);
#endif
@@ -258,7 +258,7 @@
{
long tmpEndOfData = readU16(input, encryption) + input->tell();
#ifdef DEBUG
- uint16_t tmpOverrideFlags = readU16(input, encryption);
+ tmpOverrideFlags = readU16(input, encryption);
#else
readU16(input, encryption);
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment