--- gettext-0.18.3/gettext-runtime/libasprintf/vasnprintf.c.orig	2013-07-07 00:58:57.000000000 -0400
+++ gettext-0.18.3/gettext-runtime/libasprintf/vasnprintf.c	2017-01-05 14:09:46.000000000 -0500
@@ -148,5 +148,5 @@
   /* TCHAR_T is wchar_t.  */
 # define USE_SNPRINTF 1
-# if HAVE_DECL__SNWPRINTF
+# if HAVE_DECL__SNPRINTF__SNWPRINTF
    /* On Windows, the function swprintf() has a different signature than
       on Unix; we use the function _snwprintf() or - on mingw - snwprintf()
--- gettext-0.18.3/gettext-runtime/intl/printf.c.orig	2012-12-04 01:28:58.000000000 -0500
+++ gettext-0.18.3/gettext-runtime/intl/printf.c	2017-01-05 14:20:58.000000000 -0500
@@ -191,5 +191,5 @@
 #if HAVE_SNPRINTF

-# if HAVE_DECL__SNPRINTF
+# if HAVE_DECL__SNPRINTF__SNWPRINTF
    /* Windows.  The mingw function vsnprintf() has fewer bugs than the MSVCRT
       function _vsnprintf(), so prefer that.  */
@@ -309,5 +309,5 @@
 #endif

-# if HAVE_DECL__SNWPRINTF
+# if HAVE_DECL__SNPRINTF__SNWPRINTF
    /* Windows.  The function vswprintf() has a different signature than
       on Unix; we use the function _vsnwprintf() instead.  */
--- gettext-0.18.3/gettext-runtime/intl/vasnprintf.c.orig	2013-07-07 00:58:57.000000000 -0400
+++ gettext-0.18.3/gettext-runtime/intl/vasnprintf.c	2017-01-05 14:09:47.000000000 -0500
@@ -148,5 +148,5 @@
   /* TCHAR_T is wchar_t.  */
 # define USE_SNPRINTF 1
-# if HAVE_DECL__SNWPRINTF
+# if HAVE_DECL__SNPRINTF__SNWPRINTF
    /* On Windows, the function swprintf() has a different signature than
       on Unix; we use the function _snwprintf() or - on mingw - snwprintf()
--- gettext-0.18.3/gettext-tools/gnulib-lib/vasnprintf.c.orig	2013-07-07 05:16:23.000000000 -0400
+++ gettext-0.18.3/gettext-tools/gnulib-lib/vasnprintf.c	2017-01-05 14:09:47.000000000 -0500
@@ -148,5 +148,5 @@
   /* TCHAR_T is wchar_t.  */
 # define USE_SNPRINTF 1
-# if HAVE_DECL__SNWPRINTF
+# if HAVE_DECL__SNPRINTF__SNWPRINTF
    /* On Windows, the function swprintf() has a different signature than
       on Unix; we use the function _snwprintf() or - on mingw - snwprintf()
--- gettext-0.18.3/gettext-tools/libgettextpo/vasnprintf.c.orig	2013-07-07 05:17:14.000000000 -0400
+++ gettext-0.18.3/gettext-tools/libgettextpo/vasnprintf.c	2017-01-05 14:09:48.000000000 -0500
@@ -148,5 +148,5 @@
   /* TCHAR_T is wchar_t.  */
 # define USE_SNPRINTF 1
-# if HAVE_DECL__SNWPRINTF
+# if HAVE_DECL__SNPRINTF__SNWPRINTF
    /* On Windows, the function swprintf() has a different signature than
       on Unix; we use the function _snwprintf() or - on mingw - snwprintf()
