[b2.x.x] backport into 2.x.x the rev 2252 of trunk
This commit is contained in:
parent
1c35a9ec95
commit
62b6625a2f
|
@ -187,6 +187,7 @@ CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H)
|
||||||
CHECK_INCLUDE_FILE("memory.h" HAVE_MEMORY_H)
|
CHECK_INCLUDE_FILE("memory.h" HAVE_MEMORY_H)
|
||||||
CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H)
|
CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H)
|
||||||
CHECK_INCLUDE_FILE("stdlib.h" HAVE_STDLIB_H)
|
CHECK_INCLUDE_FILE("stdlib.h" HAVE_STDLIB_H)
|
||||||
|
CHECK_INCLUDE_FILE("stdio.h" HAVE_STDIO_H)
|
||||||
CHECK_INCLUDE_FILE("string.h" HAVE_STRING_H)
|
CHECK_INCLUDE_FILE("string.h" HAVE_STRING_H)
|
||||||
CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H)
|
CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H)
|
||||||
CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H)
|
CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H)
|
||||||
|
|
|
@ -80,7 +80,7 @@ defined with this macro as being exported.
|
||||||
#endif /* OPJ_EXPORTS */
|
#endif /* OPJ_EXPORTS */
|
||||||
#endif /* !OPJ_STATIC || !_WIN32 */
|
#endif /* !OPJ_STATIC || !_WIN32 */
|
||||||
|
|
||||||
typedef int OPJ_BOOL; /*FIXME it should be to follow the name of others OPJ_TYPE -> OPJ_BOOL*/
|
typedef int OPJ_BOOL;
|
||||||
#define OPJ_TRUE 1
|
#define OPJ_TRUE 1
|
||||||
#define OPJ_FALSE 0
|
#define OPJ_FALSE 0
|
||||||
|
|
||||||
|
@ -100,6 +100,11 @@ typedef uint32_t OPJ_UINT32;
|
||||||
typedef int64_t OPJ_INT64;
|
typedef int64_t OPJ_INT64;
|
||||||
typedef uint64_t OPJ_UINT64;
|
typedef uint64_t OPJ_UINT64;
|
||||||
|
|
||||||
|
typedef int64_t OPJ_OFF_T; /* 64-bit file offset type */
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
typedef size_t OPJ_SIZE_T;
|
||||||
|
|
||||||
/* Avoid compile-time warning because parameter is not used */
|
/* Avoid compile-time warning because parameter is not used */
|
||||||
#define OPJ_ARG_NOT_USED(x) (void)(x)
|
#define OPJ_ARG_NOT_USED(x) (void)(x)
|
||||||
|
|
||||||
|
|
|
@ -43,10 +43,6 @@ typedef unsigned __int64 uint64_t;
|
||||||
#error unsupported platform
|
#error unsupported platform
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
typedef size_t OPJ_SIZE_T;
|
|
||||||
|
|
||||||
/* 64-bit file offset type */
|
|
||||||
typedef int64_t OPJ_OFF_T;
|
|
||||||
|
|
||||||
#ifndef HAVE_SSIZE_T
|
#ifndef HAVE_SSIZE_T
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
|
|
Loading…
Reference in New Issue