From: Wayne Davison <wayned@samba.org>
Date: Mon, 30 May 2011 19:48:04 +0000 (-0700)
Subject: We need VA_COPY() defined more.  Fix dangling #endif.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/f187ce36cc8d08e9cefc0662102131a139240a23

We need VA_COPY() defined more.  Fix dangling #endif.
---

diff --git a/lib/snprintf.c b/lib/snprintf.c
index f7ab908c..dd72f3e8 100644
--- a/lib/snprintf.c
+++ b/lib/snprintf.c
@@ -141,9 +141,6 @@
  void dummy_snprintf(void) {} 
 #endif /* HAVE_SNPRINTF, etc */
 
-/* yes this really must be a ||. Don't muck with this (tridge) */
-#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
-
 #ifdef HAVE_LONG_DOUBLE
 #define LDOUBLE long double
 #else
@@ -169,6 +166,10 @@
 #define VA_COPY(dest, src) (dest) = (src)
 #endif
 #endif
+#endif
+
+/* yes this really must be a ||. Don't muck with this (tridge) */
+#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
 
 /*
  * dopr(): poor man's version of doprintf
@@ -1232,8 +1233,6 @@ int rsync_snprintf(char *str,size_t count,const char *fmt,...)
 #define snprintf rsync_snprintf
 #endif
 
-#endif 
-
 #ifndef HAVE_VASPRINTF
  int vasprintf(char **ptr, const char *format, va_list ap)
 {