1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-23 01:49:53 +03:00

Remove "UINT_PTR" and "LONG_PTR", use original type everywhere

This commit is contained in:
Davide Beatrici 2020-08-15 09:18:21 +02:00
parent b4cd4ce360
commit 1c56562cc7
2 changed files with 12 additions and 8 deletions

View File

@ -19,15 +19,19 @@
// Make available the types for Windows even if windows.h is not included // Make available the types for Windows even if windows.h is not included
#ifndef _WINDEF_ #ifndef _WINDEF_
typedef void *HWND; typedef void *HWND;
typedef void *HFONT; typedef void *HFONT;
typedef void *HICON; typedef void *HICON;
typedef void *HMENU; typedef void *HMENU;
typedef UINT_PTR WPARAM;
typedef LONG_PTR LPARAM;
typedef void *HINSTANCE; typedef void *HINSTANCE;
#ifdef CPU_64
typedef unsigned __int64 *WPARAM;
typedef __int64 *LPARAM;
#else
typedef unsigned int *WPARAM;
typedef long *LPARAM;
#endif // CPU_64
#endif // _WINDEF_ #endif // _WINDEF_

View File

@ -191,10 +191,6 @@ typedef unsigned int UINT;
typedef unsigned int UINT32; typedef unsigned int UINT32;
typedef unsigned int DWORD; typedef unsigned int DWORD;
typedef signed int INT; typedef signed int INT;
typedef int UINT_PTR;
typedef long LONG_PTR;
#endif #endif
// 16bit integer type // 16bit integer type
@ -224,7 +220,11 @@ typedef signed long long time_64t;
typedef int SOCKET; typedef int SOCKET;
#else // OS_UNIX #else // OS_UNIX
#ifndef _WINSOCK2API_ #ifndef _WINSOCK2API_
typedef UINT_PTR SOCKET; #ifdef CPU_64
typedef unsigned __int64 SOCKET;
#else
typedef unsigned int SOCKET;
#endif // CPU_64
#endif // _WINSOCK2API_ #endif // _WINSOCK2API_
#endif // OS_UNIX #endif // OS_UNIX