tccgen: scopes levels for local symbols (update 1)

Catch top level redeclarations too.

Also fix mistakes in tcctest.c and the tcc sources (win32)
showing up now.

2 files changed, 10 insertions, 4 deletions

diff --git a/win32/include/_mingw.h b/win32/include/_mingw.h
index e400814..416d8dc 100644
--- a/win32/include/_mingw.h
+++ b/win32/include/_mingw.h
@@ -100,16 +100,19 @@ typedef __time64_t time_t;
 #define _TIME_T_DEFINED
 #endif
 
+#if 0 // defined in stddef.h
 typedef unsigned long size_t;
-#define _SIZE_T_DEFINED
 typedef long ssize_t;
+typedef unsigned short wchar_t;
+#endif
+#define _SIZE_T_DEFINED
 #define _SSIZE_T_DEFINED
+#define _WCHAR_T_DEFINED
 
-typedef unsigned int wint_t;
 typedef unsigned short wctype_t;
+typedef unsigned int wint_t;
 #define _WCTYPE_T_DEFINED
-typedef unsigned short wchar_t;
-#define _WCHAR_T_DEFINED
+#define _WINT_T
 
 typedef int errno_t;
 #define _ERRCODE_DEFINED
diff --git a/win32/include/stdint.h b/win32/include/stdint.h
index 1f81fcc..cdebf44 100644
--- a/win32/include/stdint.h
+++ b/win32/include/stdint.h
@@ -31,6 +31,8 @@
 #define __need_wchar_t
 #include "stddef.h"
 
+#ifndef __int8_t_defined
+#define __int8_t_defined
 /* 7.18.1.1  Exact-width integer types */
 typedef signed char int8_t;
 typedef unsigned char   uint8_t;
@@ -40,6 +42,7 @@ typedef int  int32_t;
 typedef unsigned   uint32_t;
 typedef long long  int64_t;
 typedef unsigned long long   uint64_t;
+#endif
 
 /* 7.18.1.2  Minimum-width integer types */
 typedef signed char int_least8_t;