1 files changed, 10 insertions, 18 deletions

diff --git a/libical/src/libical/vsnprintf.c b/libical/src/libical/vsnprintf.c
index 88a8c63..982920b 100644
--- a/libical/src/libical/vsnprintf.c
+++ b/libical/src/libical/vsnprintf.c
@@ -1,2 +1,5 @@
-#ifdef __osf__
+#ifndef WIN32
+#include "config.h"
+#endif
+#ifndef HAVE_SNPRINTF
 /*
@@ -27,10 +30,10 @@
 
-#include <sys/types.h>
-#include <stdio.h>
-
-#include <unistd.h>
+#ifndef WIN32
 #include <sys/param.h>
 #include <sys/mman.h>
+#include <unistd.h>
+#endif
+#include <sys/types.h>
 #include <signal.h>
-
+#include <stdio.h>
 #include <string.h>
@@ -159,16 +162,5 @@ snprintf(str, n, fmt, va_alist)
 
-#elif defined ( _WIN32 )
-
-#include <stdio.h>
-#include <stdarg.h>
-
-int snprintf(char *str, size_t n, char const *fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	
-  return _snprintf(str, n, fmt, ap);
-}
 
 #else
+
 /* ANSI C forbids an empty source file... */