mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-23 13:35:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix build after C++ conversion of csync

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

Fixes #5993
This commit is contained in:
Jocelyn Turcotte 2017-09-04 17:40:56 +02:00
parent b1bb7ec1a8
commit 715b8c4683
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/csync/csync.h
View file

@ -42,6 +42,13 @@
#include <memory> #include <memory>
#include <QByteArray> #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 { enum csync_status_codes_e {
CSYNC_STATUS_OK = 0, CSYNC_STATUS_OK = 0,
@ -157,10 +164,10 @@ struct OCSYNC_EXPORT csync_file_stat_s {
time_t modtime; time_t modtime;
int64_t size; int64_t size;
uint64_t inode; uint64_t inode;
enum csync_ftw_type_e type : 4; enum csync_ftw_type_e type BITFIELD(4);
bool child_modified : 1; bool child_modified BITFIELD(1);
bool has_ignored_files : 1; /* specify that a directory, or child directory contains ignored files */ bool has_ignored_files BITFIELD(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. bool is_hidden BITFIELD(1); // Not saved in the DB, only used during discovery for local files.
QByteArray path; QByteArray path;
QByteArray rename_path; QByteArray rename_path;

8
src/libsync/syncfileitem.h
View file

@ -23,14 +23,6 @@
#include <csync.h> #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 { namespace OCC {
/** /**