diff options
Diffstat (limited to 'tests/src/Common/Platform')
| -rw-r--r-- | tests/src/Common/Platform/platformdefines.cpp | 4 | ||||
| -rw-r--r-- | tests/src/Common/Platform/platformdefines.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/src/Common/Platform/platformdefines.cpp b/tests/src/Common/Platform/platformdefines.cpp index 4caead59ea..82061ac90d 100644 --- a/tests/src/Common/Platform/platformdefines.cpp +++ b/tests/src/Common/Platform/platformdefines.cpp @@ -89,7 +89,7 @@ int TP_slen(LPWSTR str) return len; } -int TP_scmp_s(LPSTR str1, LPSTR str2) +int TP_scmp_s(LPCSTR str1, LPCSTR str2) { // < 0 str1 less than str2 // 0 str1 identical to str2 @@ -277,7 +277,7 @@ DWORD TP_GetFullPathName(LPWSTR fileName, DWORD nBufferLength, LPWSTR lpBuffer) return GetFullPathNameW(fileName, nBufferLength, lpBuffer, NULL); #else char nativeFullPath[MAX_PATH]; - realpath(HackyConvertToSTR(fileName), nativeFullPath); + (void)realpath(HackyConvertToSTR(fileName), nativeFullPath); LPWSTR fullPathForCLR = HackyConvertToWSTR(nativeFullPath); wcscpy_s(lpBuffer, MAX_PATH, fullPathForCLR); return wcslen(lpBuffer); diff --git a/tests/src/Common/Platform/platformdefines.h b/tests/src/Common/Platform/platformdefines.h index d0760fd6ae..0961e86b2d 100644 --- a/tests/src/Common/Platform/platformdefines.h +++ b/tests/src/Common/Platform/platformdefines.h @@ -72,7 +72,7 @@ LPWSTR HackyConvertToWSTR(char* pszInput); typedef pthread_t THREAD_ID; typedef void* (*MacWorker)(void*); -typedef DWORD (*LPTHREAD_START_ROUTINE)(void*); +typedef DWORD __stdcall (*LPTHREAD_START_ROUTINE)(void*); #ifdef UNICODE typedef WCHAR TCHAR; #else // ANSI @@ -87,7 +87,7 @@ typedef void* HMODULE; typedef void* ULONG_PTR; typedef unsigned error_t; typedef void* LPVOID; -typedef char BYTE; +typedef unsigned char BYTE; typedef WCHAR OLECHAR; #endif @@ -97,7 +97,7 @@ typedef WCHAR OLECHAR; error_t TP_scpy_s(LPWSTR strDestination, size_t sizeInWords, LPCWSTR strSource); error_t TP_scat_s(LPWSTR strDestination, size_t sizeInWords, LPCWSTR strSource); int TP_slen(LPWSTR str); -int TP_scmp_s(LPSTR str1, LPSTR str2); +int TP_scmp_s(LPCSTR str1, LPCSTR str2); int TP_wcmp_s(LPWSTR str1, LPWSTR str2); error_t TP_getenv_s(size_t* pReturnValue, LPWSTR buffer, size_t sizeInWords, LPCWSTR varname); error_t TP_putenv_s(LPTSTR name, LPTSTR value); |