From: Jocelyn Turcotte <jturcotte@woboq.com>
Date: Mon, 4 Sep 2017 15:40:56 +0000 (+0200)
Subject: Fix build after C++ conversion of csync
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~701^2~128
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=41f215fd8d7a20625590467ca06f43e333512031;p=nextcloud-desktop.git

Fix build after C++ conversion of csync

Use the same macro as in SyncFileItem for bitfields on enums.

Fixes #5993
---

diff --git a/src/csync/csync.h b/src/csync/csync.h
index e2a8bb62d..1bda232ff 100644
--- a/src/csync/csync.h
+++ b/src/csync/csync.h
@@ -42,6 +42,13 @@
 #include <memory>
 #include <QByteArray>
 
+#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_CLANG) && (__GNUC__ * 100 + __GNUC_MINOR__ < 408)
+// openSuse 12.3 didn't like enum bitfields.
+#define BITFIELD(size)
+#else
+#define BITFIELD(size) :size
+#endif
+
 enum csync_status_codes_e {
   CSYNC_STATUS_OK         = 0,
 
@@ -157,10 +164,10 @@ struct OCSYNC_EXPORT csync_file_stat_s {
   time_t modtime;
   int64_t size;
   uint64_t inode;
-  enum csync_ftw_type_e type  : 4;
-  bool child_modified         : 1;
-  bool has_ignored_files      : 1; /* specify that a directory, or child directory contains ignored files */
-  bool is_hidden              : 1; // Not saved in the DB, only used during discovery for local files.
+  enum csync_ftw_type_e type BITFIELD(4);
+  bool child_modified BITFIELD(1);
+  bool has_ignored_files BITFIELD(1); // Specify that a directory, or child directory contains ignored files.
+  bool is_hidden BITFIELD(1); // Not saved in the DB, only used during discovery for local files.
 
   QByteArray path;
   QByteArray rename_path;
diff --git a/src/libsync/syncfileitem.h b/src/libsync/syncfileitem.h
index baa8a7510..571eabc19 100644
--- a/src/libsync/syncfileitem.h
+++ b/src/libsync/syncfileitem.h
@@ -23,14 +23,6 @@
 
 #include <csync.h>
 
-#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_CLANG) && (__GNUC__ * 100 + __GNUC_MINOR__ < 408)
-// openSuse 12.3 didn't like enum bitfields.
-#define BITFIELD(size)
-#else
-#define BITFIELD(size) :size
-#endif
-
-
 namespace OCC {
 
 /**