Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2fff0a4
)
We need VA_COPY() defined more. Fix dangling #endif.
author
Wayne Davison
<wayned@samba.org>
Mon, 30 May 2011 19:48:04 +0000
(12:48 -0700)
committer
Wayne Davison
<wayned@samba.org>
Mon, 30 May 2011 19:48:04 +0000
(12:48 -0700)
lib/snprintf.c
patch
|
blob
|
blame
|
history
diff --git
a/lib/snprintf.c
b/lib/snprintf.c
index
f7ab908
..
dd72f3e
100644
(file)
--- a/
lib/snprintf.c
+++ b/
lib/snprintf.c
@@
-141,9
+141,6
@@
void dummy_snprintf(void) {}
#endif /* HAVE_SNPRINTF, etc */
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
#ifdef HAVE_LONG_DOUBLE
#define LDOUBLE long double
#else
@@
-169,6
+166,10
@@
#define VA_COPY(dest, src) (dest) = (src)
#endif
#endif
#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
/*
* 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
#define snprintf rsync_snprintf
#endif
-#endif
-
#ifndef HAVE_VASPRINTF
int vasprintf(char **ptr, const char *format, va_list ap)
{
#ifndef HAVE_VASPRINTF
int vasprintf(char **ptr, const char *format, va_list ap)
{