Alexandre Julliard : msvcrt: Use the correct type for findnext64.

Alexandre Julliard julliard at winehq.org
Fri Jan 6 15:31:39 CST 2012


Module: wine
Branch: master
Commit: 446a6b3556be626c123fba1489e68cb42c222946
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=446a6b3556be626c123fba1489e68cb42c222946

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Jan  6 21:57:30 2012 +0100

msvcrt: Use the correct type for findnext64.

---

 dlls/msvcrt/dir.c      |    4 ++--
 include/msvcrt/wchar.h |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c
index 28f5314..8043cba 100644
--- a/dlls/msvcrt/dir.c
+++ b/dlls/msvcrt/dir.c
@@ -601,7 +601,7 @@ int CDECL MSVCRT__findnexti64(MSVCRT_intptr_t hand, struct MSVCRT__finddatai64_t
  *
  * 64-bit version of _findnext.
  */
-int CDECL MSVCRT__findnext64(long hand, struct MSVCRT__finddata64_t * ft)
+int CDECL MSVCRT__findnext64(MSVCRT_intptr_t hand, struct MSVCRT__finddata64_t * ft)
 {
   WIN32_FIND_DATAA find_data;
 
@@ -639,7 +639,7 @@ int CDECL MSVCRT__wfindnext64(MSVCRT_intptr_t hand, struct MSVCRT__wfinddata64_t
  *
  * 64-bit/32-bit version of _findnext.
  */
-int CDECL MSVCRT__findnext64i32(long hand, struct MSVCRT__finddata64i32_t * ft)
+int CDECL MSVCRT__findnext64i32(MSVCRT_intptr_t hand, struct MSVCRT__finddata64i32_t * ft)
 {
   WIN32_FIND_DATAA find_data;
 
diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h
index 4c26624..028e2cb 100644
--- a/include/msvcrt/wchar.h
+++ b/include/msvcrt/wchar.h
@@ -266,10 +266,10 @@ int      __cdecl _wrmdir(const wchar_t*);
 int      __cdecl _waccess(const wchar_t*,int);
 int      __cdecl _wchmod(const wchar_t*,int);
 int      __cdecl _wcreat(const wchar_t*,int);
-__msvcrt_long __cdecl _wfindfirst(const wchar_t*,struct _wfinddata_t*);
-__msvcrt_long __cdecl _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*);
-int      __cdecl _wfindnext(__msvcrt_long,struct _wfinddata_t*);
-int      __cdecl _wfindnexti64(__msvcrt_long, struct _wfinddatai64_t*);
+intptr_t __cdecl _wfindfirst(const wchar_t*,struct _wfinddata_t*);
+intptr_t __cdecl _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*);
+int      __cdecl _wfindnext(intptr_t,struct _wfinddata_t*);
+int      __cdecl _wfindnexti64(intptr_t, struct _wfinddatai64_t*);
 wchar_t* __cdecl _wmktemp(wchar_t*);
 int      __cdecl _wopen(const wchar_t*,int,...);
 int      __cdecl _wrename(const wchar_t*,const wchar_t*);




More information about the wine-cvs mailing list