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.
This commit is contained in:
parent
bd3959dc77
commit
b3c581760f
|
@ -29,6 +29,8 @@
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "opj_includes.h"
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#else
|
#else
|
||||||
|
@ -36,7 +38,6 @@
|
||||||
#include <sys/resource.h>
|
#include <sys/resource.h>
|
||||||
#include <sys/times.h>
|
#include <sys/times.h>
|
||||||
#endif /* _WIN32 */
|
#endif /* _WIN32 */
|
||||||
#include "opj_includes.h"
|
|
||||||
|
|
||||||
OPJ_FLOAT64 opj_clock(void) {
|
OPJ_FLOAT64 opj_clock(void) {
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
|
Loading…
Reference in New Issue