From 1c684df5b89bee6a67e07e0733c5a65198a3afe5 Mon Sep 17 00:00:00 2001
From: Marcus Brinkmann <marcus@neumann.local>
Date: Wed, 1 Jun 2011 21:43:30 +0200
Subject: Fix size_t vs int issues.

---
 common/ChangeLog | 4 ++++
 common/util.h    | 1 +
 2 files changed, 5 insertions(+)

(limited to 'common')

diff --git a/common/ChangeLog b/common/ChangeLog
index d77fad586..4f8b5414f 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-01  Marcus Brinkmann  <mb@g10code.com>
+
+	* util.h: Undef snprintf before redefining it.
+
 2011-05-20  Werner Koch  <wk@g10code.com>
 
 	* util.h: Remove some error code substitutes.
diff --git a/common/util.h b/common/util.h
index 45bccecd2..31c2caacb 100644
--- a/common/util.h
+++ b/common/util.h
@@ -62,6 +62,7 @@
 
 /* Due to a bug in mingw32's snprintf related to the 'l' modifier and
    for increased portability we use our snprintf on all systems. */
+#undef snprintf
 #define snprintf estream_snprintf
 
 
-- 
cgit v1.2.3