openjpip.h and openjpip.c can't use index_t as a convenience typedef, because OI inherited index_t in sys/types.h from Solaris. Adjust to use the underlying index_param_t instead. --- openjpeg-2.5.3/src/lib/openjpip/openjpip.h.orig +++ openjpeg-2.5.3/src/lib/openjpip/openjpip.h @@ -281,23 +281,20 @@ * test the format of index (cidx) box in JP2 file */ -/** Redefinition of index parameters*/ -typedef index_param_t index_t; - /** * Parse JP2 file and get index information from cidx box inside * * @param[in] fd file descriptor of the JP2 file * @return pointer to the generated structure of index parameters */ -OPJ_API index_t * OPJ_CALLCONV get_index_from_JP2file(int fd); +OPJ_API index_param_t * OPJ_CALLCONV get_index_from_JP2file(int fd); /** * Destroy index parameters * * @param[in,out] idx addressof the index pointer */ -OPJ_API void OPJ_CALLCONV destroy_index(index_t **idx); +OPJ_API void OPJ_CALLCONV destroy_index(index_param_t **idx); /** @@ -305,7 +302,7 @@ * * @param[in] index index parameters */ -OPJ_API void OPJ_CALLCONV output_index(index_t *index); +OPJ_API void OPJ_CALLCONV output_index(index_param_t *index); #endif /*SERVER*/ --- openjpeg-2.5.3/src/lib/openjpip/openjpip.c.orig +++ openjpeg-2.5.3/src/lib/openjpip/openjpip.c @@ -445,7 +445,7 @@ opj_free(*dec); } -index_t * OPJ_CALLCONV get_index_from_JP2file(int fd) +index_param_t * OPJ_CALLCONV get_index_from_JP2file(int fd) { char *data; @@ -473,12 +473,12 @@ return parse_jp2file(fd); } -void OPJ_CALLCONV destroy_index(index_t **idx) +void OPJ_CALLCONV destroy_index(index_param_t **idx) { delete_index(idx); } -void OPJ_CALLCONV output_index(index_t *index) +void OPJ_CALLCONV output_index(index_param_t *index) { print_index(*index); } --- openjpeg-2.5.3/src/bin/jpip/opj_jpip_test.c.orig +++ openjpeg-2.5.3/src/bin/jpip/opj_jpip_test.c @@ -52,7 +52,7 @@ main(int argc, char *argv[]) { int fd; - index_t *jp2idx; + index_param_t *jp2idx; if (argc < 2) { return 1; }