[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  f187ce3 We need VA_COPY() defined more.  Fix dangling #endif.
      from  2fff0a4 Merge latest samba version to get va_end() fixes, etc.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f187ce36cc8d08e9cefc0662102131a139240a23
Author: Wayne Davison <wayned at samba.org>
Date:   Mon May 30 12:48:04 2011 -0700

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

-----------------------------------------------------------------------

Summary of changes:
 lib/snprintf.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/snprintf.c b/lib/snprintf.c
index f7ab908..dd72f3e 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)
 {


-- 
The rsync repository.