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,51 +1,54 @@
-#ifdef __osf__
+#ifndef WIN32
+#include "config.h"
+#endif
+#ifndef HAVE_SNPRINTF
 /*
  * Revision 12: http://theos.com/~deraadt/snprintf.c
  *
  * Copyright (c) 1997 Theo de Raadt
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#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>
 #if __STDC__
 #include <stdarg.h>
 #include <stdlib.h>
 #else
 #include <varargs.h>
 #endif
 #include <setjmp.h>
 
 #ifndef roundup
 #define roundup(x, y) ((((x)+((y)-1))/(y))*(y))
 #endif
 
 static int pgsize;
 static char *curobj;
 static sigjmp_buf bail;
@@ -144,37 +147,26 @@ snprintf(str, n, fmt, va_alist)
         size_t n;
         char *fmt;
         va_dcl
 #endif
 {
         va_list ap;
 #if __STDC__
         va_start(ap, fmt);
 #else
         va_start(ap);
 #endif
 
         return (vsnprintf(str, n, fmt, ap));
         va_end(ap);
 }
 
-#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... */
 
 static void vsnprintf_dummy_func() {
    vsnprintf_dummy_func();
 }
 
 #endif