Differential D14253 Diff 39032 multimedia/assimp/files/patch-code_Q3BSPZipArchive.cpp

Changeset View

Standalone View

Property	Old Value	New Value
fbsd:nokeywords	null	yes \ No newline at end of property
svn:eol-style	null	native \ No newline at end of property
svn:mime-type	null	text/plain \ No newline at end of property

				--- code/Q3BSPZipArchive.cpp.orig 2018-02-07 19:36:57 UTC
				+++ code/Q3BSPZipArchive.cpp
				@@ -43,6 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
				tcbernerUnsubmitted Done Inline Actions upstream candidate? tcberner: upstream candidate?
				yuriAuthorUnsubmitted Done Inline Actions Upstream already has both patches now. I didn't want to take the current revision because it might be unstable. yuri: Upstream already has both patches now. I didn't want to take the current revision because it…
				tcbernerUnsubmitted Done Inline Actions In that case, I would use directly https://github.com/assimp/assimp/commit/096056b899d9c423cdcad527849126e3e3e17a34.patch and call it patch-git_096056 or something like this :) tcberner: In that case, I would use directly https://github.

				#include "Q3BSPZipArchive.h"
				#include <cassert>
				+#include <stdlib.h>
				#include <assimp/ai_assert.h>

				namespace Assimp {