diff options
| author | Adriaan de Groot <adridg@FreeBSD.org> | 2020-05-31 12:42:19 +0000 |
|---|---|---|
| committer | Adriaan de Groot <adridg@FreeBSD.org> | 2020-05-31 12:42:19 +0000 |
| commit | b01da5e68f95f5133fcdc04abb0b62432acc69f2 (patch) | |
| tree | fb0a0729ecf1149877f3ba3f2f26f5ae9b2ef1f3 /emulators/qmc2/files | |
| parent | 4ea034dc857df509d0b26d20e11370ca20009015 (diff) | |
| download | ports-b01da5e68f95f5133fcdc04abb0b62432acc69f2.tar.gz ports-b01da5e68f95f5133fcdc04abb0b62432acc69f2.zip | |
Notes
Diffstat (limited to 'emulators/qmc2/files')
| -rw-r--r-- | emulators/qmc2/files/patch-qmc2_lzma_7zTypes.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/emulators/qmc2/files/patch-qmc2_lzma_7zTypes.h b/emulators/qmc2/files/patch-qmc2_lzma_7zTypes.h new file mode 100644 index 000000000000..03ea8278da17 --- /dev/null +++ b/emulators/qmc2/files/patch-qmc2_lzma_7zTypes.h @@ -0,0 +1,23 @@ +This avoids errors list the following, where True is a C++ +identifier used in scoped context; the #define eats it. + +/usr/local/include/qt5/QtCore/qcborstreamreader.h:143:76: error: expected unqualified-id + bool isFalse() const { return isSimpleType(QCborSimpleType::False); } + ^ +lzma/7zTypes.h:98:15: note: expanded from macro 'False' +#define False 0 + +--- qmc2/lzma/7zTypes.h.orig 2020-05-30 14:14:41 UTC ++++ qmc2/lzma/7zTypes.h +@@ -94,8 +94,11 @@ typedef size_t SizeT; + #endif + + typedef int Bool_7z; ++#ifndef __cplusplus ++/* Only for library internals */ + #define True 1 + #define False 0 ++#endif + + + #ifdef _WIN32 |