diff options
Diffstat (limited to 'graphics/libfpx/files')
| -rw-r--r-- | graphics/libfpx/files/patch-c++ | 10 | ||||
| -rw-r--r-- | graphics/libfpx/files/patch-unused-padding | 15 |
2 files changed, 15 insertions, 10 deletions
diff --git a/graphics/libfpx/files/patch-c++ b/graphics/libfpx/files/patch-c++ deleted file mode 100644 index 691f7be32979..000000000000 --- a/graphics/libfpx/files/patch-c++ +++ /dev/null @@ -1,10 +0,0 @@ ---- oless/h/owchar.h 2013-09-03 13:38:08.000000000 -0400 -+++ oless/h/owchar.h 2013-09-11 18:31:34.000000000 -0400 -@@ -24,6 +24,6 @@ - #include <stdarg.h> - -- - #ifdef __cplusplus -+#include <string> - extern "C" { - #endif diff --git a/graphics/libfpx/files/patch-unused-padding b/graphics/libfpx/files/patch-unused-padding new file mode 100644 index 000000000000..10ae881ec697 --- /dev/null +++ b/graphics/libfpx/files/patch-unused-padding @@ -0,0 +1,15 @@ +The padding is important (earlier versions tried to remove it leading to peril), +but clang++ complains about it. Mark it as __unused to prevent that... +--- oless/h/dir.hxx 2014-02-12 08:14:24.000000000 -0500 ++++ oless/h/dir.hxx 2014-02-14 11:36:59.000000000 -0500 +@@ -142,5 +142,9 @@ + inline void SetBitFlags(BYTE bValue, BYTE bMask); + +- BYTE _bpad[CBDIRPAD]; // do not remove, bad things will happen! ++ BYTE _bpad[CBDIRPAD] // do not remove, bad things will happen! ++#ifdef __clang__ ++ __unused ++#endif ++ ; + }; + |