[Libreoffice-commits] core.git: external/jpeg-turbo

[Caolán McNamara]

 external/jpeg-turbo/jpeg-turbo.arm_build.patch.1 |   13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 875b81ec6f6fbbaa4801807c00da00c567caaa95
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 15 15:47:09 2017 +0000

    use upstream arm fix
    
    https://github.com/libjpeg-turbo/libjpeg-turbo/commit/dfefba77520ded5c5fd4864e76352a5f3eb23e74
    
    Change-Id: I2a5d318ecf91bb576e888aa4d604d1a4ab24271e

diff --git a/external/jpeg-turbo/jpeg-turbo.arm_build.patch.1 b/external/jpeg-turbo/jpeg-turbo.arm_build.patch.1
index 66acb52..dbd449e 100644
--- a/external/jpeg-turbo/jpeg-turbo.arm_build.patch.1
+++ b/external/jpeg-turbo/jpeg-turbo.arm_build.patch.1
@@ -1,18 +1,11 @@
 diff -ur jpeg.org/Makefile.am jpeg/Makefile.am
 --- jpeg.org/jmemmgr.c      2017-03-15 14:29:29.286587049 +0000
 +++ jpeg/jmemmgr.c	2017-03-15 14:31:21.096378506 +0000
-@@ -27,12 +27,13 @@
-  * memory then you shouldn't care about a little bit of unused code...)
-  */
- 
-+#include <stdint.h>
-+
- #define JPEG_INTERNALS
- #define AM_MEMORY_MANAGER       /* we define jvirt_Xarray_control structs */
- #include "jinclude.h"
+@@ -33,6 +33,7 @@
  #include "jpeglib.h"
  #include "jmemsys.h"            /* import the system-dependent declarations */
--#include <stdint.h>
+ #include <stdint.h>
++#include <limits.h>
  
  #ifndef NO_GETENV
  #ifndef HAVE_STDLIB_H           /* <stdlib.h> should declare getenv() */