From: Tim Kientzle <kientzle@gmail.com>
Date: Sat, 2 Jan 2010 01:16:53 +0000 (-0500)
Subject: Move dmalloc.h inclusion to where it doesn't interfere with system headers.
X-Git-Tag: v2.8.0~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d8161051a92bf17ec3e4a0ce0780ab81d6f0893;p=thirdparty%2Flibarchive.git

Move dmalloc.h inclusion to where it doesn't interfere with system headers.

SVN-Revision: 1788
---

diff --git a/libarchive/test/test.h b/libarchive/test/test.h
index 9c60824cc..40c31e13d 100644
--- a/libarchive/test/test.h
+++ b/libarchive/test/test.h
@@ -48,9 +48,6 @@
 #include <sys/types.h>  /* Windows requires this before sys/stat.h */
 #include <sys/stat.h>
 
-#ifdef USE_DMALLOC
-#include <dmalloc.h>
-#endif
 #if HAVE_DIRENT_H
 #include <dirent.h>
 #endif
@@ -299,3 +296,7 @@ int read_open_memory2(struct archive *, void *, size_t, size_t);
   assertion_equal_int(__FILE__, __LINE__, (v1), #v1, (v2), #v2, (a))
 #define assertEqualStringA(a,v1,v2)   \
   assertion_equal_string(__FILE__, __LINE__, (v1), #v1, (v2), #v2, (a))
+
+#ifdef USE_DMALLOC
+#include <dmalloc.h>
+#endif