diff options
author | Jocelyn Turcotte <jturcotte@woboq.com> | 2017-09-04 18:40:56 +0300 |
---|---|---|
committer | Jocelyn Turcotte <jturcotte@woboq.com> | 2017-09-06 14:08:23 +0300 |
commit | 715b8c4683cc93d82c12d636f57e27283095a052 (patch) | |
tree | 44436bfad6164c2a50d2f681a90bd20c0786fe0d /src/csync/csync.h | |
parent | b1bb7ec1a8edd1c973903e09f65dd8ff3a41883d (diff) |
Fix build after C++ conversion of csync
Use the same macro as in SyncFileItem for bitfields on enums.
Fixes #5993
Diffstat (limited to 'src/csync/csync.h')
-rw-r--r-- | src/csync/csync.h | 15 |
1 files changed, 11 insertions, 4 deletions
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; |