projects
/
openjpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
bd3959d
)
Fix OpenJPEG GitHub issue #633.
634/head
author
Stephan Mühlstrasser
<stm@pdflib.com>
Thu, 15 Oct 2015 08:53:33 +0000
(10:53 +0200)
committer
Stephan Mühlstrasser
<stm@pdflib.com>
Thu, 15 Oct 2015 08:53:33 +0000
(10:53 +0200)
"opj_includes.h" must be included before system headers, otherwise
inconsistent definitions of configuration macros lead to build
failures on AIX.
src/lib/openjp2/opj_clock.c
patch
|
blob
|
history
diff --git
a/src/lib/openjp2/opj_clock.c
b/src/lib/openjp2/opj_clock.c
index 0df99ef04defd84f5b442a074c42f4794e67c3fb..bb4cae734ad075705fee65bd8769bb51e282804c 100644
(file)
--- 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