From 02c0a8fcafb91d75331e6c7e0ebd0d86cd7d9ca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Tue, 30 Oct 2012 17:20:21 -0400 Subject: [PATCH] libfreerdp-core: fix build on Windows, lower warning level --- CMakeLists.txt | 3 ++- libfreerdp/core/rpc.h | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aafdbaea3..f6c25f09b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,6 +131,7 @@ if(MSVC) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MT") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /O2") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Ob2") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W2") if(CMAKE_SIZEOF_VOID_P EQUAL 8) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_AMD64_") else() @@ -249,7 +250,7 @@ set(CMAKE_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") include(CTest) if(BUILD_TESTING) - find_suggested_package(Cmockery) + find_optional_package(Cmockery) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFREERDP_TEST_EXPORTS") diff --git a/libfreerdp/core/rpc.h b/libfreerdp/core/rpc.h index 917508a84..17c9909f5 100644 --- a/libfreerdp/core/rpc.h +++ b/libfreerdp/core/rpc.h @@ -76,11 +76,11 @@ typedef struct BYTE clock_seq_hi_and_reserved; BYTE clock_seq_low; BYTE node[6]; -} uuid_t; +} p_uuid_t; typedef struct { - uuid_t if_uuid; + p_uuid_t if_uuid; UINT32 if_version; } p_syntax_id_t; @@ -387,7 +387,7 @@ typedef struct /* optional field for request, only present if the PFC_OBJECT_UUID field is non-zero */ - uuid_t object; /* 24:16 object UID */ + p_uuid_t object; /* 24:16 object UID */ /* stub data, 8-octet aligned */