Attempting to fix the snprintf() conflict on a gcc-using HPUX 11.11.

diff --git a/lib/snprintf.c b/lib/snprintf.c
index 4f3e4dc..70c55f7 100644 (file)
--- a/lib/snprintf.c
+++ b/lib/snprintf.c
@@ -752,13 +752,15 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
 }
 
 #if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
 }
 
 #if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF)

- int vsnprintf (char *str, size_t count, const char *fmt, va_list args)
+#define vsnprintf rsync_vsnprintf
+ int vsnprintf(char *str, size_t count, const char *fmt, va_list args)

 {
        return dopr(str, count, fmt, args);
 }
 #endif
 
 #if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
 {
        return dopr(str, count, fmt, args);
 }
 #endif
 
 #if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF)

+#define snprintf rsync_snprintf

  int snprintf(char *str,size_t count,const char *fmt,...)
 {
        size_t ret;
  int snprintf(char *str,size_t count,const char *fmt,...)
 {
        size_t ret;

diff --git a/rsync.h b/rsync.h
index a4233b4..8391991 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -481,11 +481,13 @@ int asprintf(char **ptr, const char *format, ...);
 int vasprintf(char **ptr, const char *format, va_list ap);
 #endif
 
 int vasprintf(char **ptr, const char *format, va_list ap);
 #endif
 

-#if !defined(HAVE_VSNPRINTF) && !defined(HAVE_C99_VSNPRINTF)
-int vsnprintf (char *str, size_t count, const char *fmt, va_list args);
+#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
+#define vsnprintf rsync_vsnprintf
+int vsnprintf(char *str, size_t count, const char *fmt, va_list args);

 #endif
 
 #endif
 

-#if !defined(HAVE_SNPRINTF) && !defined(HAVE_C99_VSNPRINTF)
+#if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
+#define snprintf rsync_snprintf

 int snprintf(char *str,size_t count,const char *fmt,...);
 #endif
 
 int snprintf(char *str,size_t count,const char *fmt,...);
 #endif