Don't redefine __WINE_USE_MSVCRT (msvc warning).

include/msvcrt/conio.h

@@ -7,8 +7,9 @@
  */
 #ifndef __WINE_CONIO_H
 #define __WINE_CONIO_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
-
+#endif
 
 #ifdef __cplusplus
 extern "C" {

include/msvcrt/crtdbg.h

@@ -19,8 +19,9 @@
  */
 #ifndef __WINE_CRTDBG_H_
 #define __WINE_CRTDBG_H_
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
-
+#endif
 
 /* The debug API is not implemented in Winelib.
  * Redirect everything to the regular APIs.

include/msvcrt/ctype.h

@@ -7,7 +7,9 @@
  */
 #ifndef __WINE_CTYPE_H
 #define __WINE_CTYPE_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #ifndef MSVCRT
 # ifdef USE_MSVCRT_PREFIX

include/msvcrt/direct.h

@@ -7,7 +7,9 @@
  */
 #ifndef __WINE_DIRECT_H
 #define __WINE_DIRECT_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #ifndef MSVCRT
 # ifdef USE_MSVCRT_PREFIX

include/msvcrt/dos.h

@@ -7,8 +7,9 @@
  */
 #ifndef __WINE_DOS_H
 #define __WINE_DOS_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
-
+#endif
 
 /* The following are also defined in io.h */
 #define _A_NORMAL 0x00000000

include/msvcrt/eh.h

@@ -19,7 +19,9 @@
  */
 #ifndef __WINE_EH_H
 #define __WINE_EH_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #if !defined(__cplusplus) && !defined(USE_MSVCRT_PREFIX)
 #error "eh.h is meant only for C++ applications"

include/msvcrt/errno.h

@@ -18,7 +18,9 @@
 
 #ifndef __WINE_ERRNO_H
 #define __WINE_ERRNO_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #ifndef MSVCRT
 # ifdef USE_MSVCRT_PREFIX

include/msvcrt/fcntl.h

@@ -7,8 +7,9 @@
  */
 #ifndef __WINE_FCNTL_H
 #define __WINE_FCNTL_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
-
+#endif
 
 #define _O_RDONLY      0
 #define _O_WRONLY      1

include/msvcrt/io.h

@@ -7,7 +7,9 @@
  */
 #ifndef __WINE_IO_H
 #define __WINE_IO_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #ifndef MSVCRT
 # ifdef USE_MSVCRT_PREFIX

include/msvcrt/locale.h

@@ -19,7 +19,9 @@
  */
 #ifndef __WINE_LOCALE_H
 #define __WINE_LOCALE_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #ifndef MSVCRT
 # ifdef USE_MSVCRT_PREFIX

include/msvcrt/malloc.h

@@ -19,7 +19,9 @@
  */
 #ifndef __WINE_MALLOC_H
 #define __WINE_MALLOC_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #ifndef MSVCRT
 # ifdef USE_MSVCRT_PREFIX

include/msvcrt/mbctype.h

@@ -19,8 +19,9 @@
  */
 #ifndef __WINE_MBCTYPE_H
 #define __WINE_MBCTYPE_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
-
+#endif
 
 #ifdef __cplusplus
 extern "C" {

include/msvcrt/mbstring.h

@@ -19,7 +19,9 @@
  */
 #ifndef __WINE_MBSTRING_H
 #define __WINE_MBSTRING_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #ifndef MSVCRT
 # ifdef USE_MSVCRT_PREFIX

include/msvcrt/process.h

@@ -7,7 +7,9 @@
  */
 #ifndef __WINE_PROCESS_H
 #define __WINE_PROCESS_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #ifndef MSVCRT
 # ifdef USE_MSVCRT_PREFIX

include/msvcrt/search.h

@@ -19,7 +19,9 @@
  */
 #ifndef __WINE_SEARCH_H
 #define __WINE_SEARCH_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #ifndef MSVCRT
 # ifdef USE_MSVCRT_PREFIX

include/msvcrt/setjmp.h

@@ -19,7 +19,9 @@
  */
 #ifndef __WINE_SETJMP_H
 #define __WINE_SETJMP_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #ifndef MSVCRT
 # ifdef USE_MSVCRT_PREFIX

include/msvcrt/share.h

@@ -23,7 +23,9 @@
 
 #ifndef __WINE_SHARE_H
 #define __WINE_SHARE_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #define	SH_COMPAT	0x00	/* Compatibility */
 #define	SH_DENYRW	0x10	/* Deny read/write */
@@ -38,4 +40,3 @@
 #define _SH_DENYNO SH_DENYNO
 
 #endif	/* __WINE_SHARE_H_ */
-

include/msvcrt/stddef.h

@@ -19,7 +19,9 @@
  */
 #ifndef __WINE_STDDEF_H
 #define __WINE_STDDEF_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #ifndef MSVCRT
 # ifdef USE_MSVCRT_PREFIX

include/msvcrt/stdio.h

@@ -7,7 +7,9 @@
  */
 #ifndef __WINE_STDIO_H
 #define __WINE_STDIO_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #ifndef RC_INVOKED
 #include <stdarg.h>

include/msvcrt/stdlib.h

@@ -7,7 +7,9 @@
  */
 #ifndef __WINE_STDLIB_H
 #define __WINE_STDLIB_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #ifndef MSVCRT
 # ifdef USE_MSVCRT_PREFIX
@@ -169,8 +171,8 @@ int         MSVCRT(atoi)(const char*);
 long        MSVCRT(atol)(const char*);
 void*       MSVCRT(calloc)(MSVCRT(size_t),MSVCRT(size_t));
 #ifdef __i386__
-long long    MSVCRT(div)(int,int);
-unsigned long long MSVCRT(ldiv)(long,long);
+__int64    MSVCRT(div)(int,int);
+unsigned __int64 MSVCRT(ldiv)(long,long);
 #else
 MSVCRT(div_t) MSVCRT(div)(int,int);
 MSVCRT(ldiv_t) MSVCRT(ldiv)(long,long);
@@ -238,7 +240,7 @@ static inline char* itoa(int value, char* str, int radix) { return _itoa(value,
 static inline char* ltoa(long value, char* str, int radix) { return _ltoa(value, str, radix); }
 static inline _onexit_t onexit(_onexit_t func) { return _onexit(func); }
 static inline int putenv(const char* str) { return _putenv(str); }
-static inline void swab(char* src, char* dst, int len) { return _swab(src, dst, len); }
+static inline void swab(char* src, char* dst, int len) { _swab(src, dst, len); }
 static inline char* ultoa(unsigned long value, char* str, int radix) { return _ultoa(value, str, radix); }
 #endif /* USE_MSVCRT_PREFIX */
 

include/msvcrt/string.h

@@ -7,7 +7,9 @@
  */
 #ifndef __WINE_STRING_H
 #define __WINE_STRING_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #ifndef MSVCRT
 # ifdef USE_MSVCRT_PREFIX

include/msvcrt/sys/locking.h

@@ -19,7 +19,9 @@
  */
 #ifndef __WINE_SYS_LOCKING_H__
 #define __WINE_SYS_LOCKING_H__
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #define _LK_UNLCK 0
 #define _LK_LOCK 1

include/msvcrt/sys/stat.h

@@ -7,7 +7,9 @@
  */
 #ifndef __WINE_SYS_STAT_H
 #define __WINE_SYS_STAT_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #include "sys/types.h"
 

include/msvcrt/sys/timeb.h

@@ -19,7 +19,9 @@
  */
 #ifndef __WINE_SYS_TIMEB_H
 #define __WINE_SYS_TIMEB_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #ifndef MSVCRT
 # ifdef USE_MSVCRT_PREFIX

include/msvcrt/sys/types.h

@@ -19,7 +19,9 @@
  */
 #ifndef __WINE_SYS_TYPES_H
 #define __WINE_SYS_TYPES_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #ifndef MSVCRT
 # ifdef USE_MSVCRT_PREFIX

include/msvcrt/sys/utime.h

@@ -19,7 +19,9 @@
  */
 #ifndef __WINE_SYS_UTIME_H
 #define __WINE_SYS_UTIME_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #ifndef MSVCRT
 # ifdef USE_MSVCRT_PREFIX

include/msvcrt/time.h

@@ -19,7 +19,9 @@
  */
 #ifndef __WINE_TIME_H
 #define __WINE_TIME_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #ifndef MSVCRT
 # ifdef USE_MSVCRT_PREFIX

include/msvcrt/wchar.h

@@ -7,7 +7,9 @@
  */
 #ifndef __WINE_WCHAR_H
 #define __WINE_WCHAR_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #include <stdarg.h>
 

include/msvcrt/wctype.h

@@ -19,7 +19,9 @@
  */
 #ifndef __WINE_WCTYPE_H
 #define __WINE_WCTYPE_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #ifndef MSVCRT
 # ifdef USE_MSVCRT_PREFIX