morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Windows ARM64 build fixes

Browse Source
This commit is contained in:
Marc-André Moreau
2021-05-28 17:01:12 -04:00
committed by akallabeth
parent 918c914094
commit 96f07ea993
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -454,12 +454,6 @@ if(MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Gd")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
add_definitions(-D_AMD64_)
else()
add_definitions(-D_X86_)
endif()
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})

2
winpr/include/winpr/collections.h
View File

@@ -117,7 +117,7 @@ extern "C"
WINPR_API wObject* ArrayList_Object(wArrayList* arrayList);
typedef BOOL(ArrayList_ForEachFkt)(void* data, size_t index, va_list ap);
typedef BOOL (*ArrayList_ForEachFkt)(void* data, size_t index, va_list ap);
WINPR_API BOOL ArrayList_ForEach(wArrayList* arrayList, ArrayList_ForEachFkt fkt, ...);

2
winpr/libwinpr/utils/collections/ArrayList.c
View File

@@ -485,7 +485,7 @@ BOOL ArrayList_ForEach(wArrayList* arrayList, ArrayList_ForEachFkt fkt, ...)
ArrayList_Lock_Conditional(arrayList);
count = ArrayList_Count(arrayList);
va_start(ap, (void*)fkt);
va_start(ap, fkt);
for (index = 0; index < count; index++)
{
void* obj = ArrayList_GetItem(arrayList, index);