commit 5f175508960121d522661a14fedcf2fd22926f4c
author Jon Griffiths <jon_p_griffiths@yahoo.com> Fri Jul 18 22:57:15 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Jul 18 22:57:15 2003 +0000
tree 9a9e76d4b56b744a579735ea7e4abbb871660777
parent 46e9210f81ecbf90362184b0014b7786c6b9cc38

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.

include/msvcrt/stdlib.h

diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h
index 94a4364..7b640a2 100644
--- a/include/msvcrt/stdlib.h
+++ b/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 @@
 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 */