apr.h.in (apr-1.6.5.tar.bz2) | : | apr.h.in (apr-1.7.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 95 | skipping to change at line 95 | |||
#define APR_HAVE_PROCESS_H @processh@ | #define APR_HAVE_PROCESS_H @processh@ | |||
#define APR_HAVE_PTHREAD_H @pthreadh@ | #define APR_HAVE_PTHREAD_H @pthreadh@ | |||
#define APR_HAVE_SEMAPHORE_H @semaphoreh@ | #define APR_HAVE_SEMAPHORE_H @semaphoreh@ | |||
#define APR_HAVE_SIGNAL_H @signalh@ | #define APR_HAVE_SIGNAL_H @signalh@ | |||
#define APR_HAVE_STDARG_H @stdargh@ | #define APR_HAVE_STDARG_H @stdargh@ | |||
#define APR_HAVE_STDINT_H @stdint@ | #define APR_HAVE_STDINT_H @stdint@ | |||
#define APR_HAVE_STDIO_H @stdioh@ | #define APR_HAVE_STDIO_H @stdioh@ | |||
#define APR_HAVE_STDLIB_H @stdlibh@ | #define APR_HAVE_STDLIB_H @stdlibh@ | |||
#define APR_HAVE_STRING_H @stringh@ | #define APR_HAVE_STRING_H @stringh@ | |||
#define APR_HAVE_STRINGS_H @stringsh@ | #define APR_HAVE_STRINGS_H @stringsh@ | |||
#define APR_HAVE_INTTYPES_H @inttypesh@ | ||||
#define APR_HAVE_SYS_IOCTL_H @sys_ioctlh@ | #define APR_HAVE_SYS_IOCTL_H @sys_ioctlh@ | |||
#define APR_HAVE_SYS_SENDFILE_H @sys_sendfileh@ | #define APR_HAVE_SYS_SENDFILE_H @sys_sendfileh@ | |||
#define APR_HAVE_SYS_SIGNAL_H @sys_signalh@ | #define APR_HAVE_SYS_SIGNAL_H @sys_signalh@ | |||
#define APR_HAVE_SYS_SOCKET_H @sys_socketh@ | #define APR_HAVE_SYS_SOCKET_H @sys_socketh@ | |||
#define APR_HAVE_SYS_SOCKIO_H @sys_sockioh@ | #define APR_HAVE_SYS_SOCKIO_H @sys_sockioh@ | |||
#define APR_HAVE_SYS_SYSLIMITS_H @sys_syslimitsh@ | #define APR_HAVE_SYS_SYSLIMITS_H @sys_syslimitsh@ | |||
#define APR_HAVE_SYS_TIME_H @sys_timeh@ | #define APR_HAVE_SYS_TIME_H @sys_timeh@ | |||
#define APR_HAVE_SYS_TYPES_H @sys_typesh@ | #define APR_HAVE_SYS_TYPES_H @sys_typesh@ | |||
#define APR_HAVE_SYS_UIO_H @sys_uioh@ | #define APR_HAVE_SYS_UIO_H @sys_uioh@ | |||
#define APR_HAVE_SYS_UN_H @sys_unh@ | #define APR_HAVE_SYS_UN_H @sys_unh@ | |||
skipping to change at line 170 | skipping to change at line 171 | |||
#endif /* APR_HAVE_WINDOWS_H */ | #endif /* APR_HAVE_WINDOWS_H */ | |||
#if APR_HAVE_SYS_TYPES_H | #if APR_HAVE_SYS_TYPES_H | |||
#include <sys/types.h> | #include <sys/types.h> | |||
#endif | #endif | |||
#if APR_HAVE_SYS_SOCKET_H | #if APR_HAVE_SYS_SOCKET_H | |||
#include <sys/socket.h> | #include <sys/socket.h> | |||
#endif | #endif | |||
#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS) | #if APR_HAVE_STDINT_H | |||
#ifdef __cplusplus | ||||
/* C99 7.18.4 requires that stdint.h only exposes INT64_C | /* C99 7.18.4 requires that stdint.h only exposes INT64_C | |||
* and UINT64_C for C++ implementations if this is defined: */ | * and UINT64_C for C++ implementations if this is defined: */ | |||
#ifndef __STDC_CONSTANT_MACROS | ||||
#define __STDC_CONSTANT_MACROS | #define __STDC_CONSTANT_MACROS | |||
#endif | #endif | |||
/* C++ needs this too for PRI*NN formats: */ | ||||
#if APR_HAVE_STDINT_H | #ifndef __STDC_FORMAT_MACROS | |||
#define __STDC_FORMAT_MACROS | ||||
#endif | ||||
#endif /* __cplusplus */ | ||||
#include <stdint.h> | #include <stdint.h> | |||
#endif | #endif | |||
#if APR_HAVE_INTTYPES_H | ||||
#include <inttypes.h> | ||||
#endif | ||||
#if APR_HAVE_SYS_WAIT_H | #if APR_HAVE_SYS_WAIT_H | |||
#include <sys/wait.h> | #include <sys/wait.h> | |||
#endif | #endif | |||
#ifdef OS2 | #ifdef OS2 | |||
#define INCL_DOS | #define INCL_DOS | |||
#define INCL_DOSERRORS | #define INCL_DOSERRORS | |||
#include <os2.h> | #include <os2.h> | |||
#endif | #endif | |||
/* header files for PATH_MAX, _POSIX_PATH_MAX */ | /* header files for PATH_MAX, _POSIX_PATH_MAX */ | |||
#if APR_HAVE_LIMITS_H | #if APR_HAVE_LIMITS_H | |||
#include <limits.h> | #include <limits.h> | |||
#else | #else | |||
#if APR_HAVE_SYS_SYSLIMITS_H | #if APR_HAVE_SYS_SYSLIMITS_H | |||
#include <sys/syslimits.h> | #include <sys/syslimits.h> | |||
#endif | #endif | |||
#endif | #endif | |||
/* __APPLE__ is now the official pre-defined macro for macOS */ | ||||
#ifdef __APPLE__ | ||||
#undef DARWIN | ||||
#undef DARWIN_10 | ||||
#define DARWIN | ||||
#define DARWIN_10 | ||||
#endif /* __APPLE__ */ | ||||
#ifdef __cplusplus | #ifdef __cplusplus | |||
extern "C" { | extern "C" { | |||
#endif | #endif | |||
/** | /** | |||
* @addtogroup apr_platform | * @addtogroup apr_platform | |||
* @ingroup APR | * @ingroup APR | |||
* @{ | * @{ | |||
*/ | */ | |||
skipping to change at line 281 | skipping to change at line 299 | |||
#define APR_HAS_RANDOM @rand@ | #define APR_HAS_RANDOM @rand@ | |||
#define APR_HAS_OTHER_CHILD @oc@ | #define APR_HAS_OTHER_CHILD @oc@ | |||
#define APR_HAS_DSO @aprdso@ | #define APR_HAS_DSO @aprdso@ | |||
#define APR_HAS_SO_ACCEPTFILTER @acceptfilter@ | #define APR_HAS_SO_ACCEPTFILTER @acceptfilter@ | |||
#define APR_HAS_UNICODE_FS @have_unicode_fs@ | #define APR_HAS_UNICODE_FS @have_unicode_fs@ | |||
#define APR_HAS_PROC_INVOKED @have_proc_invoked@ | #define APR_HAS_PROC_INVOKED @have_proc_invoked@ | |||
#define APR_HAS_USER @apr_has_user@ | #define APR_HAS_USER @apr_has_user@ | |||
#define APR_HAS_LARGE_FILES @aprlfs@ | #define APR_HAS_LARGE_FILES @aprlfs@ | |||
#define APR_HAS_XTHREAD_FILES @apr_has_xthread_files@ | #define APR_HAS_XTHREAD_FILES @apr_has_xthread_files@ | |||
#define APR_HAS_OS_UUID @osuuid@ | #define APR_HAS_OS_UUID @osuuid@ | |||
#define APR_HAS_TIMEDLOCKS @apr_has_timedlocks@ | ||||
#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD @apr_procattr_user_set_requires_ password@ | #define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD @apr_procattr_user_set_requires_ password@ | |||
/* APR sets APR_FILES_AS_SOCKETS to 1 on systems where it is possible | /* APR sets APR_FILES_AS_SOCKETS to 1 on systems where it is possible | |||
* to poll on files/pipes. | * to poll on files/pipes. | |||
*/ | */ | |||
#define APR_FILES_AS_SOCKETS @file_as_socket@ | #define APR_FILES_AS_SOCKETS @file_as_socket@ | |||
/* This macro indicates whether or not EBCDIC is the native character set. | /* This macro indicates whether or not EBCDIC is the native character set. | |||
*/ | */ | |||
skipping to change at line 335 | skipping to change at line 354 | |||
* (executable, lib, etc...) which contains both 32 | * (executable, lib, etc...) which contains both 32 | |||
* and 64 bit versions. The issue is that if APR is | * and 64 bit versions. The issue is that if APR is | |||
* built universally, if something else is compiled | * built universally, if something else is compiled | |||
* against it, some bit sizes will depend on whether | * against it, some bit sizes will depend on whether | |||
* it is 32 or 64 bit. This is determined by the __LP64__ | * it is 32 or 64 bit. This is determined by the __LP64__ | |||
* flag. Since we need to support both, we have to | * flag. Since we need to support both, we have to | |||
* handle OS X unqiuely. | * handle OS X unqiuely. | |||
*/ | */ | |||
#ifdef DARWIN_10 | #ifdef DARWIN_10 | |||
#undef APR_SIZEOF_VOIDP | #undef APR_SIZEOF_VOIDP | |||
#undef INT64_C | #undef APR_INT64_C | |||
#undef UINT64_C | #undef APR_UINT64_C | |||
#ifdef __LP64__ | #ifdef __LP64__ | |||
typedef long apr_int64_t; | typedef long apr_int64_t; | |||
typedef unsigned long apr_uint64_t; | typedef unsigned long apr_uint64_t; | |||
#define APR_SIZEOF_VOIDP 8 | #define APR_SIZEOF_VOIDP 8 | |||
#define INT64_C(v) (v ## L) | #define APR_INT64_C(v) (v ## L) | |||
#define UINT64_C(v) (v ## UL) | #define APR_UINT64_C(v) (v ## UL) | |||
#else | #else | |||
typedef long long apr_int64_t; | typedef long long apr_int64_t; | |||
typedef unsigned long long apr_uint64_t; | typedef unsigned long long apr_uint64_t; | |||
#define APR_SIZEOF_VOIDP 4 | #define APR_SIZEOF_VOIDP 4 | |||
#define INT64_C(v) (v ## LL) | #define APR_INT64_C(v) (v ## LL) | |||
#define UINT64_C(v) (v ## ULL) | #define APR_UINT64_C(v) (v ## ULL) | |||
#endif | #endif | |||
#else | #else | |||
typedef @long_value@ apr_int64_t; | typedef @int64_value@ apr_int64_t; | |||
typedef unsigned @long_value@ apr_uint64_t; | typedef @uint64_value@ apr_uint64_t; | |||
/* Mechanisms to properly type numeric literals */ | ||||
@int64_literal@ | ||||
@uint64_literal@ | ||||
#endif | #endif | |||
typedef @size_t_value@ apr_size_t; | typedef @size_t_value@ apr_size_t; | |||
typedef @ssize_t_value@ apr_ssize_t; | typedef @ssize_t_value@ apr_ssize_t; | |||
typedef @off_t_value@ apr_off_t; | typedef @off_t_value@ apr_off_t; | |||
typedef @socklen_t_value@ apr_socklen_t; | typedef @socklen_t_value@ apr_socklen_t; | |||
typedef @ino_t_value@ apr_ino_t; | typedef @ino_t_value@ apr_ino_t; | |||
#if APR_SIZEOF_VOIDP == 8 | #if APR_SIZEOF_VOIDP == 8 | |||
typedef apr_uint64_t apr_uintptr_t; | typedef apr_uint64_t apr_uintptr_t; | |||
#else | #else | |||
typedef apr_uint32_t apr_uintptr_t; | typedef apr_uint32_t apr_uintptr_t; | |||
#endif | #endif | |||
/* Are we big endian? */ | /* Are we big endian? */ | |||
#define APR_IS_BIGENDIAN @bigendian@ | #define APR_IS_BIGENDIAN @bigendian@ | |||
/* Mechanisms to properly type numeric literals */ | ||||
@int64_literal@ | ||||
@uint64_literal@ | ||||
#ifdef INT16_MIN | #ifdef INT16_MIN | |||
#define APR_INT16_MIN INT16_MIN | #define APR_INT16_MIN INT16_MIN | |||
#else | #else | |||
#define APR_INT16_MIN (-0x7fff - 1) | #define APR_INT16_MIN (-0x7fff - 1) | |||
#endif | #endif | |||
#ifdef INT16_MAX | #ifdef INT16_MAX | |||
#define APR_INT16_MAX INT16_MAX | #define APR_INT16_MAX INT16_MAX | |||
#else | #else | |||
#define APR_INT16_MAX (0x7fff) | #define APR_INT16_MAX (0x7fff) | |||
End of changes. 12 change blocks. | ||||
15 lines changed or deleted | 34 lines changed or added |