From: Stephan Mühlstrasser <stm@pdflib.com>
Date: Thu, 15 Oct 2015 08:53:33 +0000 (+0200)
Subject: Fix OpenJPEG GitHub issue #633.
X-Git-Tag: v2.1.1~22^2~27^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3c581760f8b3da08af27f8121d23beb3a9e48eb;p=openjpeg

Fix OpenJPEG GitHub issue #633.

"opj_includes.h" must be included before system headers, otherwise
inconsistent definitions of configuration macros lead to build
failures on AIX.
---

diff --git a/src/lib/openjp2/opj_clock.c b/src/lib/openjp2/opj_clock.c
index 0df99ef0..bb4cae73 100644
--- a/src/lib/openjp2/opj_clock.c
+++ b/src/lib/openjp2/opj_clock.c
@@ -29,6 +29,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "opj_includes.h"
+
 #ifdef _WIN32
 #include <windows.h>
 #else
@@ -36,7 +38,6 @@
 #include <sys/resource.h>
 #include <sys/times.h>
 #endif /* _WIN32 */
-#include "opj_includes.h"
 
 OPJ_FLOAT64 opj_clock(void) {
 #ifdef _WIN32