maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix build on 1.0 again.

Browse Source
This commit is contained in:
Michael Jumper 2013-07-18 21:52:40 -07:00
parent 5c4a468264
commit f9bd8eb22b
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/protocols/rdp/client.c
View File

@ -54,12 +54,12 @@
#include <freerdp/cache/palette.h>
#include <freerdp/cache/pointer.h>
#include <freerdp/cache/offscreen.h>
#include <freerdp/client/channels.h>
#include <freerdp/channels/channels.h>
#include <freerdp/input.h>
#include <freerdp/constants.h>
#ifdef HAVE_FREERDP_CHANNELS_CHANNELS_H
#include <freerdp/channels/channels.h>
#ifdef HAVE_FREERDP_CLIENT_CHANNELS_H
#include <freerdp/client/channels.h>
#endif
#ifdef HAVE_FREERDP_ADDIN_H

2
src/protocols/rdp/compat/winpr-stream.c
View File

@ -45,5 +45,3 @@ void Stream_Free(wStream* s, BOOL bFreeBuffer) {
/* STUB */
}
#endif

6
src/protocols/rdp/compat/winpr-stream.h
View File

@ -37,9 +37,10 @@
#ifndef __GUAC_WINPR_STREAM_COMPAT_H
#define __GUAC_WINPR_STREAM_COMPAT_H
/* FreeRDP 1.0 streams */
#include <freerdp/utils/stream.h>
#include "winpr-wtypes.h"
#define Stream_New stream_new
/* FreeRDP 1.0 streams */
#define Stream_Write stream_write
#define Stream_Write_UINT8 stream_write_uint8
@ -59,6 +60,7 @@
#define Stream_GetPointer stream_get_mark
#define Stream_EnsureRemainingCapacity stream_check_size
#define Stream_Write stream_write
#define Stream_GetPosition stream_get_pos
#define Stream_SetPosition stream_set_pos
#define Stream_SetPointer stream_set_mark
#define Stream_Buffer stream_get_head

4
src/protocols/rdp/rdp_cliprdr.h
View File

@ -39,9 +39,9 @@
#define __GUAC_RDP_RDP_CLIPRDR_H
#ifdef ENABLE_WINPR
#include <winpr/wtypes.h>
#include <winpr/stream.h>
#else
#include "compat/winpr-wtypes.h"
#include "compat/winpr-stream.h"
#endif
#include <freerdp/freerdp.h>

2
src/protocols/rdp/rdp_settings.c
View File

@ -58,7 +58,7 @@ void guac_rdp_commit_settings(guac_rdp_settings* guac_settings, rdpSettings* rdp
rdp_settings->width = guac_settings->width;
rdp_settings->height = guac_settings->height;
rdp_settings->shell = guac_settings->initial_program;
rdp_settiongs->kbd_layout = guac_settings->server_layout->freerdp_keyboard_layout;
rdp_settings->kbd_layout = guac_settings->server_layout->freerdp_keyboard_layout;
/* Console */
rdp_settings->console_session = guac_settings->console;