Sync(15): msvcrt headers (1)

[Jon Griffiths <jon_p_griffiths@yahoo.com>]

Hi,

Relatively straightforward, this one.

Cheers,
Jon

ChangeLog:

  Jon Griffiths <jon_p_griffiths@yahoo.com>
  +include/msvcrt/conio.h include/msvcrt/crtdbg.h
   include/msvcrt/ctype.h include/msvcrt/direct.h
   include/msvcrt/dos.h include/msvcrt/eh.h
   include/msvcrt/errno.h include/msvcrt/fcntl.h
   include/msvcrt/io.h include/msvcrt/locale.h
   include/msvcrt/malloc.h include/msvcrt/mbctype.h
   include/msvcrt/mbstring.h include/msvcrt/process.h
   include/msvcrt/search.h include/msvcrt/setjmp.h
   include/msvcrt/share.h include/msvcrt/stddef.h
   include/msvcrt/stdio.h include/msvcrt/stdlib.h
   include/msvcrt/string.h include/msvcrt/sys/locking.h
   include/msvcrt/sys/stat.hinclude/msvcrt/sys/timeb.h
   include/msvcrt/sys/types.h include/msvcrt/sys/utime.h
   include/msvcrt/time.h include/msvcrt/wchar.h
   include/msvcrt/wctype.h
    Don't redefine __WINE_USE_MSVCRT (msvc warning)
    Don't return a void value in swab()
    'long long' is not recognised by msvc, use __int64

=====
"Don't wait for the seas to part, or messiahs to come;
 Don't you sit around and waste this chance..." - Live

jon_p_griffiths@yahoo.com

__________________________________
Do you Yahoo!?
SBC Yahoo! DSL - Now only $29.95 per month!
http://sbc.yahoo.com

diff -ur wine/include/msvcrt/conio.h wine-develop/include/msvcrt/conio.h
--- wine/include/msvcrt/conio.h	Sat Apr 26 19:30:33 2003
+++ wine-develop/include/msvcrt/conio.h	Wed Jul  9 18:27:05 2003
@@ -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" {
diff -ur wine/include/msvcrt/crtdbg.h wine-develop/include/msvcrt/crtdbg.h
--- wine/include/msvcrt/crtdbg.h	Tue Sep 24 03:04:45 2002
+++ wine-develop/include/msvcrt/crtdbg.h	Wed Jul  9 18:03:32 2003
@@ -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.
diff -ur wine/include/msvcrt/ctype.h wine-develop/include/msvcrt/ctype.h
--- wine/include/msvcrt/ctype.h	Sat Apr 26 19:30:33 2003
+++ wine-develop/include/msvcrt/ctype.h	Wed Jul  9 17:54:47 2003
@@ -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
diff -ur wine/include/msvcrt/direct.h wine-develop/include/msvcrt/direct.h
--- wine/include/msvcrt/direct.h	Sat Apr 26 19:30:33 2003
+++ wine-develop/include/msvcrt/direct.h	Wed Jul  9 17:53:00 2003
@@ -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
diff -ur wine/include/msvcrt/dos.h wine-develop/include/msvcrt/dos.h
--- wine/include/msvcrt/dos.h	Wed Dec 18 20:17:20 2002
+++ wine-develop/include/msvcrt/dos.h	Wed Jul  9 18:03:52 2003
@@ -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
diff -ur wine/include/msvcrt/eh.h wine-develop/include/msvcrt/eh.h
--- wine/include/msvcrt/eh.h	Wed Feb 19 22:08:44 2003
+++ wine-develop/include/msvcrt/eh.h	Wed Jul  9 18:04:08 2003
@@ -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"
diff -ur wine/include/msvcrt/errno.h wine-develop/include/msvcrt/errno.h
--- wine/include/msvcrt/errno.h	Sat Apr 26 19:30:33 2003
+++ wine-develop/include/msvcrt/errno.h	Wed Jul  9 18:04:22 2003
@@ -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
diff -ur wine/include/msvcrt/fcntl.h wine-develop/include/msvcrt/fcntl.h
--- wine/include/msvcrt/fcntl.h	Mon Oct 22 18:59:23 2001
+++ wine-develop/include/msvcrt/fcntl.h	Wed Jul  9 17:51:41 2003
@@ -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
diff -ur wine/include/msvcrt/io.h wine-develop/include/msvcrt/io.h
--- wine/include/msvcrt/io.h	Sat Apr 26 19:30:33 2003
+++ wine-develop/include/msvcrt/io.h	Wed Jul  9 17:53:28 2003
@@ -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
diff -ur wine/include/msvcrt/locale.h wine-develop/include/msvcrt/locale.h
--- wine/include/msvcrt/locale.h	Wed Dec 18 20:17:20 2002
+++ wine-develop/include/msvcrt/locale.h	Wed Jul  9 18:04:39 2003
@@ -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
diff -ur wine/include/msvcrt/malloc.h wine-develop/include/msvcrt/malloc.h
--- wine/include/msvcrt/malloc.h	Sat Apr 26 19:30:33 2003
+++ wine-develop/include/msvcrt/malloc.h	Wed Jul  9 18:04:53 2003
@@ -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
diff -ur wine/include/msvcrt/mbctype.h wine-develop/include/msvcrt/mbctype.h
--- wine/include/msvcrt/mbctype.h	Wed Dec 18 20:17:20 2002
+++ wine-develop/include/msvcrt/mbctype.h	Wed Jul  9 18:05:05 2003
@@ -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" {
diff -ur wine/include/msvcrt/mbstring.h wine-develop/include/msvcrt/mbstring.h
--- wine/include/msvcrt/mbstring.h	Wed Dec 18 20:17:20 2002
+++ wine-develop/include/msvcrt/mbstring.h	Wed Jul  9 18:05:21 2003
@@ -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
diff -ur wine/include/msvcrt/process.h wine-develop/include/msvcrt/process.h
--- wine/include/msvcrt/process.h	Sat Apr 26 19:30:33 2003
+++ wine-develop/include/msvcrt/process.h	Wed Jul  9 18:05:33 2003
@@ -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
diff -ur wine/include/msvcrt/search.h wine-develop/include/msvcrt/search.h
--- wine/include/msvcrt/search.h	Sat Apr 26 19:30:33 2003
+++ wine-develop/include/msvcrt/search.h	Wed Jul  9 18:05:46 2003
@@ -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
diff -ur wine/include/msvcrt/setjmp.h wine-develop/include/msvcrt/setjmp.h
--- wine/include/msvcrt/setjmp.h	Wed Dec 18 20:17:20 2002
+++ wine-develop/include/msvcrt/setjmp.h	Wed Jul  9 18:06:08 2003
@@ -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
diff -ur wine/include/msvcrt/share.h wine-develop/include/msvcrt/share.h
--- wine/include/msvcrt/share.h	Fri Dec 21 19:15:11 2001
+++ wine-develop/include/msvcrt/share.h	Wed Jul  9 18:06:22 2003
@@ -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 */
diff -ur wine/include/msvcrt/stddef.h wine-develop/include/msvcrt/stddef.h
--- wine/include/msvcrt/stddef.h	Wed Dec 18 20:17:20 2002
+++ wine-develop/include/msvcrt/stddef.h	Wed Jul  9 17:55:25 2003
@@ -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
diff -ur wine/include/msvcrt/stdio.h wine-develop/include/msvcrt/stdio.h
--- wine/include/msvcrt/stdio.h	Sat Apr 26 19:30:33 2003
+++ wine-develop/include/msvcrt/stdio.h	Wed Jul  9 17:55:05 2003
@@ -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>
diff -ur wine/include/msvcrt/stdlib.h wine-develop/include/msvcrt/stdlib.h
--- wine/include/msvcrt/stdlib.h	Sat Apr 26 19:30:33 2003
+++ wine-develop/include/msvcrt/stdlib.h	Wed Jul  9 18:23:07 2003
@@ -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 @@
 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* 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 */
 
diff -ur wine/include/msvcrt/string.h wine-develop/include/msvcrt/string.h
--- wine/include/msvcrt/string.h	Sat Apr 26 19:30:33 2003
+++ wine-develop/include/msvcrt/string.h	Wed Jul  9 17:53:44 2003
@@ -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
diff -ur wine/include/msvcrt/sys/locking.h wine-develop/include/msvcrt/sys/locking.h
--- wine/include/msvcrt/sys/locking.h	Wed Mar 20 22:50:38 2002
+++ wine-develop/include/msvcrt/sys/locking.h	Wed Jul  9 18:07:39 2003
@@ -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
diff -ur wine/include/msvcrt/sys/stat.h wine-develop/include/msvcrt/sys/stat.h
--- wine/include/msvcrt/sys/stat.h	Wed Feb 19 22:08:44 2003
+++ wine-develop/include/msvcrt/sys/stat.h	Wed Jul  9 17:52:32 2003
@@ -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"
 
diff -ur wine/include/msvcrt/sys/timeb.h wine-develop/include/msvcrt/sys/timeb.h
--- wine/include/msvcrt/sys/timeb.h	Wed Feb 19 22:08:44 2003
+++ wine-develop/include/msvcrt/sys/timeb.h	Wed Jul  9 18:07:59 2003
@@ -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
diff -ur wine/include/msvcrt/sys/types.h wine-develop/include/msvcrt/sys/types.h
--- wine/include/msvcrt/sys/types.h	Tue Mar 18 14:14:57 2003
+++ wine-develop/include/msvcrt/sys/types.h	Wed Jul  9 17:52:10 2003
@@ -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
diff -ur wine/include/msvcrt/sys/utime.h wine-develop/include/msvcrt/sys/utime.h
--- wine/include/msvcrt/sys/utime.h	Wed Feb 19 22:08:44 2003
+++ wine-develop/include/msvcrt/sys/utime.h	Wed Jul  9 18:08:21 2003
@@ -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
diff -ur wine/include/msvcrt/time.h wine-develop/include/msvcrt/time.h
--- wine/include/msvcrt/time.h	Fri Jul  4 17:48:27 2003
+++ wine-develop/include/msvcrt/time.h	Wed Jul  9 18:06:43 2003
@@ -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
diff -ur wine/include/msvcrt/wchar.h wine-develop/include/msvcrt/wchar.h
--- wine/include/msvcrt/wchar.h	Wed Dec 18 20:17:20 2002
+++ wine-develop/include/msvcrt/wchar.h	Wed Jul  9 18:07:02 2003
@@ -7,7 +7,9 @@
  */
 #ifndef __WINE_WCHAR_H
 #define __WINE_WCHAR_H
+#ifndef __WINE_USE_MSVCRT
 #define __WINE_USE_MSVCRT
+#endif
 
 #include <stdarg.h>
 
diff -ur wine/include/msvcrt/wctype.h wine-develop/include/msvcrt/wctype.h
--- wine/include/msvcrt/wctype.h	Wed Dec 18 20:17:20 2002
+++ wine-develop/include/msvcrt/wctype.h	Wed Jul  9 18:07:14 2003
@@ -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