diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-09-19 09:09:29 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-09-19 09:10:31 +0300 |
| commit | d24cdb9c4a5de2dd856e86884ce67aa6f1c28453 (patch) | |
| tree | d6248d8a1bebabfc90191ad1cabb41f680b9905f /external | |
| parent | 9a5ba07ca190df89cf0cacbeca7cfafde1794686 (diff) | |
Fix error: case value evaluates to 2168791104, which cannot be narrowed ...
... to type 'long' [-Wc++11-narrowing]
Change-Id: If9d34297c08744671d2aedd6b3ef7ad3592fb431
Diffstat (limited to 'external')
| -rw-r--r-- | external/libmwaw/UnpackedTarball_libmwaw.mk | 4 | ||||
| -rw-r--r-- | external/libmwaw/c++11-narrowing.patch | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk index 50aa54c53ee5..823fab2f04a3 100644 --- a/external/libmwaw/UnpackedTarball_libmwaw.mk +++ b/external/libmwaw/UnpackedTarball_libmwaw.mk @@ -35,4 +35,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \ )) endif +$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \ + external/libmwaw/c++11-narrowing.patch \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/libmwaw/c++11-narrowing.patch b/external/libmwaw/c++11-narrowing.patch new file mode 100644 index 000000000000..8695d4471b00 --- /dev/null +++ b/external/libmwaw/c++11-narrowing.patch @@ -0,0 +1,11 @@ +--- src/lib/RagTime5StructManager.cxx ++++ src/lib/RagTime5StructManager.cxx +@@ -307,7 +307,7 @@ + fSz-=4; + long debDataPos=input->tell(); + long endDataPos=debDataPos+fSz; +- switch (type) { ++ switch ((unsigned long) type) { + case 0x360c0: + case 0x368c0: + if (fSz!=1) { |