Merge from vendor branch TNF:
[pkgsrcv2.git] / sysutils / open-vm-tools / patches / patch-bg
1 $NetBSD$
2
3 --- lib/string/str.c.orig       2008-08-08 02:01:55.000000000 -0500
4 +++ lib/string/str.c
5 @@ -37,6 +37,10 @@
6  #endif
7  #include "codeset.h"
8  
9 +#ifdef __NetBSD__
10 +#include <wchar.h>
11 +#endif
12 +
13  #if defined _WIN32 && !defined HAS_BSD_PRINTF
14  #define vsnprintf _vsnprintf
15  #endif
16 @@ -604,7 +608,7 @@ Str_SafeVasprintf(size_t *length,       
17     return StrVasprintf_Internal(length, format, arguments, TRUE);
18  }
19  
20 -#if defined(_WIN32) || defined(GLIBC_VERSION_22)
21 +#if defined(_WIN32) || (defined(GLIBC_VERSION_22) && !defined(__NetBSD__))
22  
23  /*
24   *----------------------------------------------------------------------