mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-04-01 19:39:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename WIN32 to _WIN32

Browse Source 
The latter is the proper macro defined by Windows headers.

Fixes compilation under at least clang-cl which mandates function
declarations.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2023-09-13 20:51:49 -07:00
parent dabed80523
commit 66f7869219
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vasprintf_compat.h
View File

@@ -8,9 +8,9 @@
#include "snprintf_compat.h"
#ifndef WIN32
#ifndef _WIN32
#include <stdarg.h>
#endif /* !defined(WIN32) */
#endif /* !defined(_WIN32) */
#include <stdint.h>
#include <stdlib.h>
@@ -18,10 +18,10 @@
/* CAW: compliant version of vasprintf */
static int vasprintf(char **buf, const char *fmt, va_list ap)
{
#ifndef WIN32
#ifndef _WIN32
static char _T_emptybuffer = '\0';
va_list ap2;
#endif /* !defined(WIN32) */
#endif /* !defined(_WIN32) */
int chars;
char *b;
@@ -30,16 +30,16 @@ static int vasprintf(char **buf, const char *fmt, va_list ap)
return -1;
}
#ifdef WIN32
#ifdef _WIN32
chars = _vscprintf(fmt, ap);
#else /* !defined(WIN32) */
#else /* !defined(_WIN32) */
/* CAW: RAWR! We have to hope to god here that vsnprintf doesn't overwrite
* our buffer like on some 64bit sun systems... but hey, it's time to move on
*/
va_copy(ap2, ap);
chars = vsnprintf(&_T_emptybuffer, 0, fmt, ap2);
va_end(ap2);
#endif /* defined(WIN32) */
#endif /* defined(_WIN32) */
if (chars < 0 || (size_t)chars + 1 > SIZE_MAX / sizeof(char))
{
return -1;