Attachment 2805 Details for Bug 19953

[patch] Der Patch um version aus dem Bazaarrepository zum Kompilieren zu bringen.

compile.patch (text/plain), 4.58 KB, created by rsagner on 2010-11-08 10:35 CET

(hide)

Description:

Filename:

MIME Type:

Creator: rsagner

Created: 2010-11-08 10:35 CET

Size: 4.58 KB

patch

obsolete

>diff -Naru posixxrdp.orig/configure.ac xrdp-0.5.0~20101104bzr/configure.ac
>--- posixxrdp.orig/configure.ac	2010-11-08 09:56:45.000000000 +0100
>+++ xrdp-0.5.0~20101104bzr/configure.ac	2010-11-05 13:21:36.000000000 +0100
>@@ -25,7 +25,7 @@
>               [pulse=true], [pulse=false])
> 	      if test "${enable_pulse}" != "no"
> 		then
>-		PKG_CHECK_MODULES(PULSE, libpulse >= 0.9.11,
>+		PKG_CHECK_MODULES(PULSE, libpulse >= 0.9.10,
> 		  [
> #			XRDP_ADD_PLUGIN([pulse])
> #			XRDP_ADD_CFLAGS([pulse],[${PULSE_CFLAGS}])
>diff -Naru posixxrdp.orig/libxrdp/xrdp_rdp.c xrdp-0.5.0~20101104bzr/libxrdp/xrdp_rdp.c
>--- posixxrdp.orig/libxrdp/xrdp_rdp.c	2010-11-08 09:56:44.000000000 +0100
>+++ xrdp-0.5.0~20101104bzr/libxrdp/xrdp_rdp.c	2010-11-04 13:29:00.000000000 +0100
>@@ -414,8 +414,8 @@
>     in_uint8(p, self->client_info.connectionType);
>   }
> 
>-  wcstombs(str1, (const wchar_t * restrict)(self->client_info.clientName), 16);
>-  wcstombs(str2, (const wchar_t * restrict)(self->client_info.imeFileName), 32);
>+  wcstombs(str1, (const wchar_t  * )(self->client_info.clientName), 16);
>+  wcstombs(str2, (const wchar_t  * )(self->client_info.imeFileName), 32);
>   //MDBGLOG("sound","\n\n$$$$\n postBeta2ColorDepth=%8.8x;\n highColorDepth=%d;\n supportedColorDepths=%d;\n earlyCapabilityFlags=%d;\n keyboardType=%d;\n keyboardLayout=%d;\n colorDepth=%8.8x;\n connectionType=%d;\n clientName=%s;\n imeFileName=%s;\n version=%8.8x;\n length=%d;\n",self->client_info.postBeta2ColorDepth, self->client_info.highColorDepth, self->client_info.supportedColorDepths, self->client_info.earlyCapabilityFlags, self->client_info.keyboardType, self->client_info.keyboardLayout, self->client_info.colorDepth, self->client_info.connectionType, str1, str2, (unsigned int)(self->client_info.version), ud_length);
> 
>   self->client_info.bpp = 8;
>diff -Naru posixxrdp.orig/sesman/chansrv/drdynvc.c xrdp-0.5.0~20101104bzr/sesman/chansrv/drdynvc.c
>--- posixxrdp.orig/sesman/chansrv/drdynvc.c	2010-11-08 09:56:45.000000000 +0100
>+++ xrdp-0.5.0~20101104bzr/sesman/chansrv/drdynvc.c	2010-11-04 14:20:00.000000000 +0100
>@@ -123,7 +123,7 @@
> static callback * APP_CC get_callback_from_opid(ptrdiff_t);
> 
> static ptrdiff_t APP_CC reserve_channel_id(void);
>-static int APP_CC release_channel_id(ptrdiff_t);
>+static ptrdiff_t APP_CC release_channel_id(ptrdiff_t);
> 
> static int APP_CC drdynvc_handle_connection(tbus);
> 
>diff -Naru posixxrdp.orig/sesman/chansrv/rdpfs.c xrdp-0.5.0~20101104bzr/sesman/chansrv/rdpfs.c
>--- posixxrdp.orig/sesman/chansrv/rdpfs.c	2010-11-08 09:56:45.000000000 +0100
>+++ xrdp-0.5.0~20101104bzr/sesman/chansrv/rdpfs.c	2010-11-04 13:51:51.000000000 +0100
>@@ -103,7 +103,7 @@
> static int APP_CC get_cv_fs(int, tc_p *, rdpfs *);
> static int APP_CC get_cbdata_fs(int reqid, callback **);
> static int APP_CC ntstatus_to_errcode(DWORD);
>-static APP_CC int rdpfs_parse_path(const char *, char **, char **);
>+static APP_CC ptrdiff_t rdpfs_parse_path(const char *, char **, char **);
> 
> static int APP_CC construct_MINSHALL_FRENCH_SYMLINK(MINSHALL_FRENCH_SYMLINK *);
> static char * APP_CC get_MINSHALL_FRENCH_SYMLINK(MINSHALL_FRENCH_SYMLINK *);
>diff -Naru posixxrdp.orig/sesman/chansrv/rdpport.c xrdp-0.5.0~20101104bzr/sesman/chansrv/rdpport.c
>--- posixxrdp.orig/sesman/chansrv/rdpport.c	2010-11-08 09:56:45.000000000 +0100
>+++ xrdp-0.5.0~20101104bzr/sesman/chansrv/rdpport.c	2010-11-04 14:16:27.000000000 +0100
>@@ -605,7 +605,7 @@
>   return rv;
> }
> 
>-static int APP_CC issue_port_cmd(rdpport_t * port, const rdpdr_packet_t *restrict ipkt) {
>+static int APP_CC issue_port_cmd(rdpport_t * port, const rdpdr_packet_t * ipkt) {
> 	int rv = 0;
> 	tbus fd = -1;
> 	uint32_t crc32 = 0;
>@@ -636,7 +636,7 @@
> 	uint32_t device_id = 0;
> 	uint32_t * p_crc32 = (uint32_t *)NULL;
> 	char * p = (char *)NULL;
>-	rdpdr_packet_t *restrict reply = (rdpdr_packet_t *restrict)ipkt;
>+	rdpdr_packet_t * reply = (rdpdr_packet_t * ) ipkt;
> 	rdp_irq_data_t * data = (rdp_irq_data_t *)(&(reply->data));
> 
> 	fd = port->fd;
>diff -Naru posixxrdp.orig/sesman/dynamic/xrdp_rdpeai.c xrdp-0.5.0~20101104bzr/sesman/dynamic/xrdp_rdpeai.c
>--- posixxrdp.orig/sesman/dynamic/xrdp_rdpeai.c	2010-11-08 09:56:45.000000000 +0100
>+++ xrdp-0.5.0~20101104bzr/sesman/dynamic/xrdp_rdpeai.c	2010-11-05 11:55:58.000000000 +0100
>@@ -1338,7 +1338,7 @@
> 
>       SAY("g_pa_trans = %p, g_pa_trans->sck = %d",g_pa_trans,g_pa_trans->sck);
> 
>-      pa_disable_sigpipe();
>+      //pa_disable_sigpipe();
>       signal(SIGPIPE, SIG_IGN);
> 
>       while (!done) {
>@@ -1378,7 +1378,7 @@
>     }
>     else {			/* parent */
>       unsigned char locked = 0;
>-      pa_disable_sigpipe();
>+      //pa_disable_sigpipe();
>       signal(SIGPIPE, SIG_IGN);
>       g_is_child = 0;
>       rv = pfd;

Actions: View | Diff

Attachments on bug 19953: 2805 | 2809