vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

vlib: fix C warning for UNICODE macro redefinition on windows (#6415)

pull/6416/head
Daniel Däschle 2020-09-18 11:51:55 +02:00 committed by GitHub
parent 4dda06f9bb
commit f7aa9cb0c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vlib/v/gen/cheaders.v
View File

@ -28,7 +28,7 @@ const (
#define __NOINLINE __attribute__((noinline)) #define __NOINLINE __attribute__((noinline))
#define __IRQHANDLER __attribute__((interrupt)) #define __IRQHANDLER __attribute__((interrupt))
#if defined(__x86_64__) #if defined(__x86_64__)
#define __V_amd64 1 #define __V_amd64 1
#endif #endif
#if defined(__aarch64__) || defined(__arm64__) #if defined(__aarch64__) || defined(__arm64__)
@ -38,7 +38,7 @@ const (
// Using just __GNUC__ for detecting gcc, is not reliable because other compilers define it too: // Using just __GNUC__ for detecting gcc, is not reliable because other compilers define it too:
#ifdef __GNUC__ #ifdef __GNUC__
#define __V_GCC__ #define __V_GCC__
#endif #endif
#ifdef __TINYC__ #ifdef __TINYC__
#undef __V_GCC__ #undef __V_GCC__
#endif #endif
@ -187,8 +187,12 @@ $c_common_macros
#endif #endif
#define _WIN32_WINNT 0x0600 #define _WIN32_WINNT 0x0600
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#ifndef _UNICODE
#define _UNICODE #define _UNICODE
#endif
#ifndef UNICODE
#define UNICODE #define UNICODE
#endif
#include <windows.h> #include <windows.h>
#include <io.h> // _waccess #include <io.h> // _waccess