[Pkg-owncloud-commits] [owncloud-client] 87/164: Fix build of the legacy propagator

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit ccbeb8614095cb8ca4def4fbaf7ee1cd9d63422f
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Mar 3 10:05:38 2015 +0100

    Fix build of the legacy propagator
---
 src/libsync/CMakeLists.txt      | 1 +
 src/libsync/propagateupload.cpp | 4 ++++
 src/libsync/syncengine.cpp      | 6 +++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt
index 44fed5d..28e4c3c 100644
--- a/src/libsync/CMakeLists.txt
+++ b/src/libsync/CMakeLists.txt
@@ -90,6 +90,7 @@ if(USE_NEON)
     list(APPEND libsync_SRCS
         propagator_legacy.cpp
     )
+    add_definitions(-DUSE_NEON)
 endif(USE_NEON)
 
 # These headers are installed for libowncloudsync to be used by 3rd party apps
diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp
index faf0a8b..6e5692c 100644
--- a/src/libsync/propagateupload.cpp
+++ b/src/libsync/propagateupload.cpp
@@ -28,6 +28,10 @@
 #include <cmath>
 #include <cstring>
 
+#ifdef USE_NEON
+#include "propagator_legacy.h"
+#endif
+
 namespace OCC {
 
 /**
diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index ec9de3b..11cc21a 100644
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -48,6 +48,10 @@
 #include <QElapsedTimer>
 #include <qtextcodec.h>
 
+#ifdef USE_NEON
+extern "C" int owncloud_commit(CSYNC* ctx);
+#endif
+
 namespace OCC {
 
 bool SyncEngine::_syncRunning = false;
@@ -870,7 +874,7 @@ void SyncEngine::finalize()
 
 #ifdef USE_NEON
     // De-init the neon HTTP(S) connections
-    csync_owncloud_commit(ctx);
+    owncloud_commit(_csync_ctx);
 #endif
 
     csync_commit(_csync_ctx);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git