From 2daf8b96a82e51b719b6585ed2ba2719c682ee40 Mon Sep 17 00:00:00 2001
From: grischka <grischka>
Date: Mon, 14 Jan 2013 18:14:00 +0100
Subject: [PATCH] Revert mistake in "win32: malloc.h: fix win32 ...
 _STATIC_ASSERT"

from commit fc574f14984d11f1ead50560d1bdc5ae0eaf6d8d.

The files from include are copied to win32/include with make
install or build-tcc.bat.
---
 win32/include/stdarg.h | 41 -----------------------------------------
 win32/include/stddef.h | 28 ----------------------------
 2 files changed, 69 deletions(-)
 delete mode 100644 win32/include/stdarg.h
 delete mode 100644 win32/include/stddef.h

diff --git a/win32/include/stdarg.h b/win32/include/stdarg.h
deleted file mode 100644
index 666adf76..00000000
--- a/win32/include/stdarg.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef _STDARG_H
-#define _STDARG_H
-
-#ifdef __x86_64__
-#ifndef _WIN64
-
-typedef void *va_list;
-
-va_list __va_start(void *fp);
-void *__va_arg(va_list ap, int arg_type, int size);
-va_list __va_copy(va_list src);
-void __va_end(va_list ap);
-
-#define va_start(ap, last) ((ap) = __va_start(__builtin_frame_address(0)))
-#define va_arg(ap, type)                                                \
-    (*(type *)(__va_arg(ap, __builtin_va_arg_types(type), sizeof(type))))
-#define va_copy(dest, src) ((dest) = __va_copy(src))
-#define va_end(ap) __va_end(ap)
-
-#else /* _WIN64 */
-typedef char *va_list;
-#define va_start(ap,last) ap = ((char *)&(last)) + ((sizeof(last)+7)&~7)
-#define va_arg(ap,type) (ap += (sizeof(type)+7)&~7, *(type *)(ap - ((sizeof(type)+7)&~7)))
-#define va_copy(dest, src) (dest) = (src)
-#define va_end(ap)
-#endif
-
-#else /* __i386__ */
-typedef char *va_list;
-/* only correct for i386 */
-#define va_start(ap,last) ap = ((char *)&(last)) + ((sizeof(last)+3)&~3)
-#define va_arg(ap,type) (ap += (sizeof(type)+3)&~3, *(type *)(ap - ((sizeof(type)+3)&~3)))
-#define va_copy(dest, src) (dest) = (src)
-#define va_end(ap)
-#endif
-
-/* fix a buggy dependency on GCC in libio.h */
-typedef va_list __gnuc_va_list;
-#define _VA_LIST_DEFINED
-
-#endif /* _STDARG_H */
diff --git a/win32/include/stddef.h b/win32/include/stddef.h
deleted file mode 100644
index c5dd13c3..00000000
--- a/win32/include/stddef.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef _STDDEF_H
-#define _STDDEF_H
-
-typedef __SIZE_TYPE__ size_t;
-typedef __PTRDIFF_TYPE__ ssize_t;
-typedef __WCHAR_TYPE__ wchar_t;
-typedef __PTRDIFF_TYPE__ ptrdiff_t;
-typedef __PTRDIFF_TYPE__ intptr_t;
-typedef __SIZE_TYPE__ uintptr_t;
-
-#ifndef __int8_t_defined
-#define __int8_t_defined
-typedef signed char int8_t;
-typedef signed short int int16_t;
-typedef signed int int32_t;
-typedef signed long long int int64_t;
-typedef unsigned char uint8_t;
-typedef unsigned short int uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long int uint64_t;
-#endif
-
-#define NULL ((void *)0)
-#define offsetof(type, field) ((size_t)&((type *)0)->field)
-
-void *alloca(size_t size);
-
-#endif
-- 
2.11.4.GIT