summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorMarcus Brinkmann <marcus@neumann.local>2011-06-01 21:43:30 +0200
committerMarcus Brinkmann <marcus@neumann.local>2011-06-01 21:43:30 +0200
commit1c684df5b89bee6a67e07e0733c5a65198a3afe5 (patch)
treeb4ab80ccb36ced3f029b415b39f9d1383b59207f /common
parentpo (diff)
downloadgnupg2-1c684df5b89bee6a67e07e0733c5a65198a3afe5.tar.xz
gnupg2-1c684df5b89bee6a67e07e0733c5a65198a3afe5.zip
Fix size_t vs int issues.
Diffstat (limited to 'common')
-rw-r--r--common/ChangeLog4
-rw-r--r--common/util.h1
2 files changed, 5 insertions, 0 deletions
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