snprintf-irix-needs-sys-socket-h-20040510

[openafs.git] / src / util / snprintf.c

diff --git a/src/util/snprintf.c b/src/util/snprintf.c
index ee99ecc..63cc772 100644 (file)
--- a/src/util/snprintf.c
+++ b/src/util/snprintf.c
@@ -10,9 +10,13 @@ RCSID
 #include <stdarg.h>
 #include <stdio.h>
 #include <ctype.h>
+#ifndef AFS_NT40_ENV
 #include <netinet/in.h>
 #include <netdb.h>
-#if defined(AFS_AIX32_ENV) || defined(AFS_SUN_ENV) || defined(AFS_XBSD_ENV)
+#else
+#include <winsock2.h>
+#endif
+#if defined(AFS_AIX32_ENV) || defined(AFS_SUN_ENV) || defined(AFS_XBSD_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_SGI65_ENV)
 #include <sys/socket.h>
 #endif
 #ifdef HAVE_STRING_H
@@ -443,7 +447,7 @@ afs_vsnprintf(char *p, size_t avail, const char *fmt, va_list ap)
        case 'n':               /* report count so far */
            if (lflag > 1) {
                llcountp = va_arg(ap, afs_intmax_t *);
-               *llcountp = (long long)count;
+               *llcountp = (afs_intmax_t)count;
            } else if (lflag) {
                lcountp = va_arg(ap, long *);
                *lcountp = (long)count;
@@ -520,6 +524,7 @@ vsnprintf(char *p, unsigned int avail, char *fmt, va_list ap)
 }
 #endif /* AFS_OSF20_ENV || AFS_AIX32_ENV */
 
+#ifndef AFS_NT40_ENV
 #if defined(AFS_OSF20_ENV) && !defined(AFS_DUX50_ENV) || defined(AFS_AIX32_ENV) || (defined(AFS_SUN55_ENV) && !defined(AFS_SUN56_ENV)) || !defined(HAVE_SNPRINTF)
 
 #ifdef AFS_AIX51_ENV
@@ -541,3 +546,4 @@ snprintf(char *p, unsigned int avail, char *fmt, ...)
 #endif
 }
 #endif /* AFS_OSF20_ENV || AFS_AIX32_ENV */
+#endif /* AFS_NT40_ENV */