Kaydet (Commit) e7682068 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Pass ENABLE_DEBUG into external/libetonyek

(and consequently fix the argument type of one assert invocation)

Change-Id: I8bf5f024cc104a3885f7b9bf6ed63b9f6259d47b
üst 077ad1a5
......@@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
--enable-static \
--disable-shared \
--without-docs \
--disable-debug \
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-werror \
--disable-weffc \
--without-tools \
......
......@@ -11,6 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libetonyek))
$(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,1))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,0))
$(eval $(call gb_UnpackedTarball_add_patches,libetonyek, \
external/libetonyek/assert.patch \
))
# vim: set noet sw=4 ts=4:
--- src/lib/EtonyekDocument.cpp
+++ src/lib/EtonyekDocument.cpp
@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include <cassert>
+
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/logic/tribool.hpp>
@@ -179,7 +181,7 @@
info.input->seek(0, RVNG_SEEK_SET);
}
- assert(!isGzipped);
+ assert(bool(!isGzipped));
return probeXMLImpl(info.input, probe, type, info);
}
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