[Forensics-changes] [yara] 190/192: Prevent warning due to macro redefinition

Hilko Bengen bengen at moszumanska.debian.org
Sat Jul 1 10:32:05 UTC 2017


This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag v3.6.0
in repository yara.

commit 3dc7dc4a2ad9aad3e9ed148f1ac60e82d9e18f94
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Fri May 19 14:01:40 2017 +0200

    Prevent warning due to macro redefinition
---
 libyara/modules/hash.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libyara/modules/hash.c b/libyara/modules/hash.c
index 286e0f3..c878d16 100644
--- a/libyara/modules/hash.c
+++ b/libyara/modules/hash.c
@@ -31,8 +31,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <openssl/sha.h>
 
 #if _WIN32 || __CYGWIN__
+
+#ifndef PRIu64
 #define PRIu64 "%I64d"
+#endif
+
+#ifndef PRIx64
 #define PRIx64 "%I64x"
+#endif
+
 #else
 #include <inttypes.h>
 #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git



More information about the forensics-changes mailing list