diff options
Diffstat (limited to 'extern/libopenjpeg/patches')
-rw-r--r-- | extern/libopenjpeg/patches/fbsd.patch | 13 | ||||
-rw-r--r-- | extern/libopenjpeg/patches/osx.patch | 17 |
2 files changed, 0 insertions, 30 deletions
diff --git a/extern/libopenjpeg/patches/fbsd.patch b/extern/libopenjpeg/patches/fbsd.patch deleted file mode 100644 index 90e77600941..00000000000 --- a/extern/libopenjpeg/patches/fbsd.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: extern/libopenjpeg/opj_malloc.h -=================================================================== ---- extern/libopenjpeg/opj_malloc.h (revision 27736) -+++ extern/libopenjpeg/opj_malloc.h (working copy) -@@ -76,7 +76,7 @@ - #if defined(__sun) - #define HAVE_MEMALIGN - #elif defined(__GNUC__) -- #ifndef __APPLE__ -+ #if !defined(__APPLE__) && !defined(__FreeBSD__) - #define HAVE_MEMALIGN - #include <malloc.h> - #endif diff --git a/extern/libopenjpeg/patches/osx.patch b/extern/libopenjpeg/patches/osx.patch deleted file mode 100644 index c518978eed6..00000000000 --- a/extern/libopenjpeg/patches/osx.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: opj_malloc.h -=================================================================== ---- opj_malloc.h (revision 15089) -+++ opj_malloc.h (working copy) -@@ -76,8 +76,10 @@ - #if defined(__sun) - #define HAVE_MEMALIGN - #elif defined(__GNUC__) -- #define HAVE_MEMALIGN -- #include <malloc.h> -+ #ifndef __APPLE__ -+ #define HAVE_MEMALIGN -+ #include <malloc.h> -+ #endif - /* Linux x86_64 and OSX always align allocations to 16 bytes */ - #elif !defined(__amd64__) && !defined(__APPLE__) - /* FIXME: Yes, this is a big assumption */ |