Changeset 9631 for trunk/include/win/msvcrt/stdlib.h

Timestamp:

Jan 6, 2003, 2:24:23 PM (23 years ago)

Author:

sandervl

Message:

PF: header updates

File:

• trunk/include/win/msvcrt/stdlib.h (modified) (3 diffs)

trunk/include/win/msvcrt/stdlib.h

@@ -26 +26 @@
 #define _MAX_DRIVE          3
 #define _MAX_FNAME          256
+
+#ifndef _MAX_DIR
 #define _MAX_DIR            _MAX_FNAME
+#endif
+
+#ifndef _MAX_EXT
 #define _MAX_EXT            _MAX_FNAME
+#endif
+
 #define _MAX_PATH           260
 #endif
@@ -43 +50 @@
 
 
+#ifdef __min /* watcom stdlib.h defines this */
+#undef __min
+#endif
+
+#ifdef __max /* watcom stdlib.h defines this */
+#undef __max
+#endif
+
 #define __max(a,b) (((a) > (b)) ? (a) : (b))
 #define __min(a,b) (((a) < (b)) ? (a) : (b))
+
 #ifndef __cplusplus
 #define max(a,b)   (((a) > (b)) ? (a) : (b))
@@ -167 +183 @@
 WCHAR*      _ui64tow(unsigned __int64,WCHAR*,int);
 WCHAR*      _ultow(unsigned long,WCHAR*,int);
-WCHAR*      _wfullpath(WCHAR*,const WCHAR*,size_t);
+WCHAR*      _wfullpath(WCHAR*,const WCHAR*,MSVCRT(size_t));
 WCHAR*      _wgetenv(const WCHAR*);
 void        _wmakepath(WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*);