aboutsummaryrefslogtreecommitdiffstats
path: root/palm/synce-librapi2/files
diff options
context:
space:
mode:
Diffstat (limited to 'palm/synce-librapi2/files')
-rw-r--r--palm/synce-librapi2/files/patch-rapi_context.c24
-rw-r--r--palm/synce-librapi2/files/patch-src-rapi2-file_management2.c19
-rw-r--r--palm/synce-librapi2/files/patch-src_rapi_invoke.c10
-rw-r--r--palm/synce-librapi2/files/patch-tests-CeRapiInvoke-Makefile.in10
4 files changed, 34 insertions, 29 deletions
diff --git a/palm/synce-librapi2/files/patch-rapi_context.c b/palm/synce-librapi2/files/patch-rapi_context.c
new file mode 100644
index 000000000000..414ca3c862a2
--- /dev/null
+++ b/palm/synce-librapi2/files/patch-rapi_context.c
@@ -0,0 +1,24 @@
+--- src/support/rapi_context.c 2009-07-27 13:25:07.000000000 +0400
++++ src/support/rapi_context.c 2009-07-27 13:26:52.000000000 +0400
+@@ -513,13 +513,19 @@
+ /*
+ * odccm, synce-hal, or proxy ?
+ */
++#if ENABLE_ODCCM_SUPPORT
+ if (strcmp(transport, "odccm") == 0) {
+ synce_socket_take_descriptor(context->socket, get_connection_from_odccm(info));
+ }
+- else if (strcmp(transport, "hal") == 0) {
++ else
++#endif
++#if ENABLE_HAL_SUPPORT
++ if (strcmp(transport, "hal") == 0) {
+ synce_socket_take_descriptor(context->socket, get_connection_from_hal(info));
+ }
+- else if ( !synce_socket_connect_proxy(context->socket, synce_info_get_device_ip(info)) )
++ else
++#endif
++ if ( !synce_socket_connect_proxy(context->socket, synce_info_get_device_ip(info)) )
+ {
+ synce_error("failed to connect to proxy for %s", synce_info_get_device_ip(info));
+ goto fail;
diff --git a/palm/synce-librapi2/files/patch-src-rapi2-file_management2.c b/palm/synce-librapi2/files/patch-src-rapi2-file_management2.c
deleted file mode 100644
index b3ce2a7db611..000000000000
--- a/palm/synce-librapi2/files/patch-src-rapi2-file_management2.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/rapi2/file_management2.c.orig Fri Jan 26 02:12:41 2007
-+++ src/rapi2/file_management2.c Fri Jan 26 02:13:40 2007
-@@ -40,6 +40,7 @@
- {
- RapiContext* context = rapi_context_current();
- uint32_t count = 0;
-+ uint32_t unknown;
-
- rapi_context_begin_command(context, 0x1a);
- rapi2_buffer_write_string(context->send_buffer, szPath);
-@@ -50,7 +51,7 @@
-
- /* TODO Don't know this two uint32_t fields */
- rapi_buffer_read_uint32(context->recv_buffer, &context->last_error);
-- uint32_t unknown;
-+
- rapi_buffer_read_uint32(context->recv_buffer, &unknown);
-
- rapi_buffer_read_uint32(context->recv_buffer, &count);
diff --git a/palm/synce-librapi2/files/patch-src_rapi_invoke.c b/palm/synce-librapi2/files/patch-src_rapi_invoke.c
deleted file mode 100644
index 929669891dbb..000000000000
--- a/palm/synce-librapi2/files/patch-src_rapi_invoke.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/rapi/invoke.c.orig Fri Jan 26 01:58:51 2007
-+++ src/rapi/invoke.c Fri Jan 26 01:59:15 2007
-@@ -1,6 +1,7 @@
- /* $Id: invoke.c 2355 2006-04-07 18:47:20Z voc $ */
- #include "rapi_api.h"
- #include "rapi_context.h"
-+#include <sys/socket.h>
- #include <assert.h>
- #include <stdlib.h>
-
diff --git a/palm/synce-librapi2/files/patch-tests-CeRapiInvoke-Makefile.in b/palm/synce-librapi2/files/patch-tests-CeRapiInvoke-Makefile.in
new file mode 100644
index 000000000000..9fff69d1b39c
--- /dev/null
+++ b/palm/synce-librapi2/files/patch-tests-CeRapiInvoke-Makefile.in
@@ -0,0 +1,10 @@
+--- tests/CeRapiInvoke/Makefile.in 2009-07-16 13:44:55.000000000 +0400
++++ tests/CeRapiInvoke/Makefile.in 2009-07-27 15:17:24.000000000 +0400
+@@ -227,6 +227,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CXXFLAGS = @LIBSYNCE_CFLAGS@ -Wall
++AM_CFLAGS= @LIBSYNCE_CFLAGS@ -Wall
+ AM_LDFLAGS = @LIBSYNCE_LIBS@
+ INCLUDES = -I$(top_srcdir)/src
+ CeRapiInvoke_SOURCES = CeRapiInvoke.cc ../../tools/pcommon.c