From 1d02a8b59505e2faace66ad5cbb607e994cc46eb Mon Sep 17 00:00:00 2001
From: Francois-Olivier Devaux <fodevaux@users.noreply.github.com>
Date: Tue, 21 Aug 2007 12:57:39 +0000
Subject: [PATCH] Use <xmmintrin.h> for WIN32, else use <mm_malloc.h>

---
 libopenjpeg/j2k_lib.h | 4 ++++
 libopenjpeg/t1.c      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libopenjpeg/j2k_lib.h b/libopenjpeg/j2k_lib.h
index 84a68c06..d13ac5fe 100644
--- a/libopenjpeg/j2k_lib.h
+++ b/libopenjpeg/j2k_lib.h
@@ -61,7 +61,11 @@ Allocate memory aligned to a 16 byte boundry
 @param size Bytes to allocate
 @return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
 */
+#ifdef WIN32
 #include <xmmintrin.h>
+#else
+#include <mm_malloc.h>
+#endif
 #define opj_aligned_malloc(size)	_mm_malloc(size, 16)
 #define opj_aligned_free(m) _mm_free(m)
 
diff --git a/libopenjpeg/t1.c b/libopenjpeg/t1.c
index 716f6b45..d6d7e07d 100644
--- a/libopenjpeg/t1.c
+++ b/libopenjpeg/t1.c
@@ -1124,7 +1124,7 @@ void t1_decode_cblks(
 					opj_tcd_precinct_t *prc = &band->precincts[precno];
 
 					for (cblkno = 0; cblkno < prc->cw * prc->ch; ++cblkno) {
-						int x, y, w, i, j, orient, cblk_w, cblk_h;
+						int x, y, w, i, j, cblk_w, cblk_h;
 						opj_tcd_cblk_t *cblk = &prc->cblks[cblkno];
 
 						t1_decode_cblk(