mirrors/FreeRDP
0
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2024-11-27 03:44:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:awakecoding/FreeRDP

Browse Source
This commit is contained in:
Marc-André Moreau 2012-10-31 03:43:37 -04:00
commit 9b15692263
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -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")

6
libfreerdp/core/rpc.h
View File

@ -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 */