summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2005-06-02 22:34:56 +0000
committerhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2005-06-02 22:34:56 +0000
commitef2ac8a3238435542b9974181eb20eb1280edad6 (patch)
tree986adcbe249d742a79fc52d0d5c33bc4f3e68051 /include
parent58d512041f0e4e31f16a35f6b2e1977436aabefb (diff)
- improvements for snprintf.c (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@1807 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'include')
-rw-r--r--include/snprintf.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/include/snprintf.c b/include/snprintf.c
index 773b6cd8..7360c1d3 100644
--- a/include/snprintf.c
+++ b/include/snprintf.c
@@ -86,7 +86,7 @@
#include <stdio.h>
/* make the compiler happy with an empty file */
void dummy_snprintf(void) {}
-#else
+#endif
#ifdef HAVE_LONG_DOUBLE
#define LDOUBLE long double
@@ -121,6 +121,7 @@
#define VA_COPY(dest, src) (dest) = (src)
#endif
+#if !defined(HAVE_SNPRINTF)
static size_t dopr(char *buffer, size_t maxlen, const char *format,
va_list args_in);
static void fmtstr(char *buffer, size_t *currlen, size_t maxlen,
@@ -797,7 +798,6 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
*/
/* Alexei Does not work under HP-UX */
/*#if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_SNPRINTF)*/
-#if !defined(HAVE_SNPRINTF)
int snprintf(char *str,size_t count,const char *fmt,...)
{
size_t ret;
@@ -808,9 +808,6 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
va_end(ap);
return ret;
}
-#endif
-
-#endif
#ifndef HAVE_VASPRINTF
int vasprintf(char **ptr, const char *format, va_list ap)
@@ -986,3 +983,5 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
return 0;
}
#endif /* SNPRINTF_TEST */
+
+#endif /* !SNPRINTF */