| apr.h.in (302408) | apr.h.in (362181) |
|---|---|
| 1/* Licensed to the Apache Software Foundation (ASF) under one or more 2 * contributor license agreements. See the NOTICE file distributed with 3 * this work for additional information regarding copyright ownership. 4 * The ASF licenses this file to You under the Apache License, Version 2.0 5 * (the "License"); you may not use this file except in compliance with 6 * the License. You may obtain a copy of the License at 7 * 8 * http://www.apache.org/licenses/LICENSE-2.0 --- 79 unchanged lines hidden (view full) --- 88#define APR_HAVE_SEMAPHORE_H @semaphoreh@ 89#define APR_HAVE_SIGNAL_H @signalh@ 90#define APR_HAVE_STDARG_H @stdargh@ 91#define APR_HAVE_STDINT_H @stdint@ 92#define APR_HAVE_STDIO_H @stdioh@ 93#define APR_HAVE_STDLIB_H @stdlibh@ 94#define APR_HAVE_STRING_H @stringh@ 95#define APR_HAVE_STRINGS_H @stringsh@ | 1/* Licensed to the Apache Software Foundation (ASF) under one or more 2 * contributor license agreements. See the NOTICE file distributed with 3 * this work for additional information regarding copyright ownership. 4 * The ASF licenses this file to You under the Apache License, Version 2.0 5 * (the "License"); you may not use this file except in compliance with 6 * the License. You may obtain a copy of the License at 7 * 8 * http://www.apache.org/licenses/LICENSE-2.0 --- 79 unchanged lines hidden (view full) --- 88#define APR_HAVE_SEMAPHORE_H @semaphoreh@ 89#define APR_HAVE_SIGNAL_H @signalh@ 90#define APR_HAVE_STDARG_H @stdargh@ 91#define APR_HAVE_STDINT_H @stdint@ 92#define APR_HAVE_STDIO_H @stdioh@ 93#define APR_HAVE_STDLIB_H @stdlibh@ 94#define APR_HAVE_STRING_H @stringh@ 95#define APR_HAVE_STRINGS_H @stringsh@ |
| 96#define APR_HAVE_INTTYPES_H @inttypesh@ |
|
| 96#define APR_HAVE_SYS_IOCTL_H @sys_ioctlh@ 97#define APR_HAVE_SYS_SENDFILE_H @sys_sendfileh@ 98#define APR_HAVE_SYS_SIGNAL_H @sys_signalh@ 99#define APR_HAVE_SYS_SOCKET_H @sys_socketh@ 100#define APR_HAVE_SYS_SOCKIO_H @sys_sockioh@ 101#define APR_HAVE_SYS_SYSLIMITS_H @sys_syslimitsh@ 102#define APR_HAVE_SYS_TIME_H @sys_timeh@ 103#define APR_HAVE_SYS_TYPES_H @sys_typesh@ --- 59 unchanged lines hidden (view full) --- 163#if APR_HAVE_SYS_TYPES_H 164#include <sys/types.h> 165#endif 166 167#if APR_HAVE_SYS_SOCKET_H 168#include <sys/socket.h> 169#endif 170 | 97#define APR_HAVE_SYS_IOCTL_H @sys_ioctlh@ 98#define APR_HAVE_SYS_SENDFILE_H @sys_sendfileh@ 99#define APR_HAVE_SYS_SIGNAL_H @sys_signalh@ 100#define APR_HAVE_SYS_SOCKET_H @sys_socketh@ 101#define APR_HAVE_SYS_SOCKIO_H @sys_sockioh@ 102#define APR_HAVE_SYS_SYSLIMITS_H @sys_syslimitsh@ 103#define APR_HAVE_SYS_TIME_H @sys_timeh@ 104#define APR_HAVE_SYS_TYPES_H @sys_typesh@ --- 59 unchanged lines hidden (view full) --- 164#if APR_HAVE_SYS_TYPES_H 165#include <sys/types.h> 166#endif 167 168#if APR_HAVE_SYS_SOCKET_H 169#include <sys/socket.h> 170#endif 171 |
| 171#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS) | 172#if APR_HAVE_STDINT_H 173#ifdef __cplusplus |
| 172/* C99 7.18.4 requires that stdint.h only exposes INT64_C 173 * and UINT64_C for C++ implementations if this is defined: */ | 174/* C99 7.18.4 requires that stdint.h only exposes INT64_C 175 * and UINT64_C for C++ implementations if this is defined: */ |
| 176#ifndef __STDC_CONSTANT_MACROS |
|
| 174#define __STDC_CONSTANT_MACROS 175#endif | 177#define __STDC_CONSTANT_MACROS 178#endif |
| 176 177#if APR_HAVE_STDINT_H | 179/* C++ needs this too for PRI*NN formats: */ 180#ifndef __STDC_FORMAT_MACROS 181#define __STDC_FORMAT_MACROS 182#endif 183#endif /* __cplusplus */ |
| 178#include <stdint.h> 179#endif 180 | 184#include <stdint.h> 185#endif 186 |
| 187#if APR_HAVE_INTTYPES_H 188#include <inttypes.h> 189#endif 190 |
|
| 181#if APR_HAVE_SYS_WAIT_H 182#include <sys/wait.h> 183#endif 184 185#ifdef OS2 186#define INCL_DOS 187#define INCL_DOSERRORS 188#include <os2.h> 189#endif 190 191/* header files for PATH_MAX, _POSIX_PATH_MAX */ 192#if APR_HAVE_LIMITS_H 193#include <limits.h> 194#else 195#if APR_HAVE_SYS_SYSLIMITS_H 196#include <sys/syslimits.h> 197#endif 198#endif 199 | 191#if APR_HAVE_SYS_WAIT_H 192#include <sys/wait.h> 193#endif 194 195#ifdef OS2 196#define INCL_DOS 197#define INCL_DOSERRORS 198#include <os2.h> 199#endif 200 201/* header files for PATH_MAX, _POSIX_PATH_MAX */ 202#if APR_HAVE_LIMITS_H 203#include <limits.h> 204#else 205#if APR_HAVE_SYS_SYSLIMITS_H 206#include <sys/syslimits.h> 207#endif 208#endif 209 |
| 210/* __APPLE__ is now the official pre-defined macro for macOS */ 211#ifdef __APPLE__ 212#undef DARWIN 213#undef DARWIN_10 214#define DARWIN 215#define DARWIN_10 216#endif /* __APPLE__ */ |
|
| 200 201#ifdef __cplusplus 202extern "C" { 203#endif 204 205/** 206 * @addtogroup apr_platform 207 * @ingroup APR --- 32 unchanged lines hidden (view full) --- 240#define APR_PROCESS_LOCK_IS_GLOBAL @proclockglobal@ 241 242#define APR_HAVE_CORKABLE_TCP @have_corkable_tcp@ 243#define APR_HAVE_GETRLIMIT @have_getrlimit@ 244#define APR_HAVE_IN_ADDR @have_in_addr@ 245#define APR_HAVE_INET_ADDR @have_inet_addr@ 246#define APR_HAVE_INET_NETWORK @have_inet_network@ 247#define APR_HAVE_IPV6 @have_ipv6@ | 217 218#ifdef __cplusplus 219extern "C" { 220#endif 221 222/** 223 * @addtogroup apr_platform 224 * @ingroup APR --- 32 unchanged lines hidden (view full) --- 257#define APR_PROCESS_LOCK_IS_GLOBAL @proclockglobal@ 258 259#define APR_HAVE_CORKABLE_TCP @have_corkable_tcp@ 260#define APR_HAVE_GETRLIMIT @have_getrlimit@ 261#define APR_HAVE_IN_ADDR @have_in_addr@ 262#define APR_HAVE_INET_ADDR @have_inet_addr@ 263#define APR_HAVE_INET_NETWORK @have_inet_network@ 264#define APR_HAVE_IPV6 @have_ipv6@ |
| 265#define APR_HAVE_SOCKADDR_UN @have_sockaddr_un@ |
|
| 248#define APR_HAVE_MEMMOVE @have_memmove@ 249#define APR_HAVE_SETRLIMIT @have_setrlimit@ 250#define APR_HAVE_SIGACTION @have_sigaction@ 251#define APR_HAVE_SIGSUSPEND @have_sigsuspend@ 252#define APR_HAVE_SIGWAIT @have_sigwait@ 253#define APR_HAVE_SA_STORAGE @have_sa_storage@ 254#define APR_HAVE_STRCASECMP @have_strcasecmp@ 255#define APR_HAVE_STRDUP @have_strdup@ --- 18 unchanged lines hidden (view full) --- 274#define APR_HAS_DSO @aprdso@ 275#define APR_HAS_SO_ACCEPTFILTER @acceptfilter@ 276#define APR_HAS_UNICODE_FS @have_unicode_fs@ 277#define APR_HAS_PROC_INVOKED @have_proc_invoked@ 278#define APR_HAS_USER @apr_has_user@ 279#define APR_HAS_LARGE_FILES @aprlfs@ 280#define APR_HAS_XTHREAD_FILES @apr_has_xthread_files@ 281#define APR_HAS_OS_UUID @osuuid@ | 266#define APR_HAVE_MEMMOVE @have_memmove@ 267#define APR_HAVE_SETRLIMIT @have_setrlimit@ 268#define APR_HAVE_SIGACTION @have_sigaction@ 269#define APR_HAVE_SIGSUSPEND @have_sigsuspend@ 270#define APR_HAVE_SIGWAIT @have_sigwait@ 271#define APR_HAVE_SA_STORAGE @have_sa_storage@ 272#define APR_HAVE_STRCASECMP @have_strcasecmp@ 273#define APR_HAVE_STRDUP @have_strdup@ --- 18 unchanged lines hidden (view full) --- 292#define APR_HAS_DSO @aprdso@ 293#define APR_HAS_SO_ACCEPTFILTER @acceptfilter@ 294#define APR_HAS_UNICODE_FS @have_unicode_fs@ 295#define APR_HAS_PROC_INVOKED @have_proc_invoked@ 296#define APR_HAS_USER @apr_has_user@ 297#define APR_HAS_LARGE_FILES @aprlfs@ 298#define APR_HAS_XTHREAD_FILES @apr_has_xthread_files@ 299#define APR_HAS_OS_UUID @osuuid@ |
| 300#define APR_HAS_TIMEDLOCKS @apr_has_timedlocks@ |
|
| 282 283#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD @apr_procattr_user_set_requires_password@ 284 285/* APR sets APR_FILES_AS_SOCKETS to 1 on systems where it is possible 286 * to poll on files/pipes. 287 */ 288#define APR_FILES_AS_SOCKETS @file_as_socket@ 289 --- 38 unchanged lines hidden (view full) --- 328 * built universally, if something else is compiled 329 * against it, some bit sizes will depend on whether 330 * it is 32 or 64 bit. This is determined by the __LP64__ 331 * flag. Since we need to support both, we have to 332 * handle OS X unqiuely. 333 */ 334#ifdef DARWIN_10 335#undef APR_SIZEOF_VOIDP | 301 302#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD @apr_procattr_user_set_requires_password@ 303 304/* APR sets APR_FILES_AS_SOCKETS to 1 on systems where it is possible 305 * to poll on files/pipes. 306 */ 307#define APR_FILES_AS_SOCKETS @file_as_socket@ 308 --- 38 unchanged lines hidden (view full) --- 347 * built universally, if something else is compiled 348 * against it, some bit sizes will depend on whether 349 * it is 32 or 64 bit. This is determined by the __LP64__ 350 * flag. Since we need to support both, we have to 351 * handle OS X unqiuely. 352 */ 353#ifdef DARWIN_10 354#undef APR_SIZEOF_VOIDP |
| 336#undef INT64_C 337#undef UINT64_C | 355#undef APR_INT64_C 356#undef APR_UINT64_C |
| 338#ifdef __LP64__ 339 typedef long apr_int64_t; 340 typedef unsigned long apr_uint64_t; 341 #define APR_SIZEOF_VOIDP 8 | 357#ifdef __LP64__ 358 typedef long apr_int64_t; 359 typedef unsigned long apr_uint64_t; 360 #define APR_SIZEOF_VOIDP 8 |
| 342 #define INT64_C(v) (v ## L) 343 #define UINT64_C(v) (v ## UL) | 361 #define APR_INT64_C(v) (v ## L) 362 #define APR_UINT64_C(v) (v ## UL) |
| 344#else 345 typedef long long apr_int64_t; 346 typedef unsigned long long apr_uint64_t; 347 #define APR_SIZEOF_VOIDP 4 | 363#else 364 typedef long long apr_int64_t; 365 typedef unsigned long long apr_uint64_t; 366 #define APR_SIZEOF_VOIDP 4 |
| 348 #define INT64_C(v) (v ## LL) 349 #define UINT64_C(v) (v ## ULL) | 367 #define APR_INT64_C(v) (v ## LL) 368 #define APR_UINT64_C(v) (v ## ULL) |
| 350#endif 351#else | 369#endif 370#else |
| 352 typedef @long_value@ apr_int64_t; 353 typedef unsigned @long_value@ apr_uint64_t; | 371 typedef @int64_value@ apr_int64_t; 372 typedef @uint64_value@ apr_uint64_t; 373 374 /* Mechanisms to properly type numeric literals */ 375 @int64_literal@ 376 @uint64_literal@ |
| 354#endif 355 356typedef @size_t_value@ apr_size_t; 357typedef @ssize_t_value@ apr_ssize_t; 358typedef @off_t_value@ apr_off_t; 359typedef @socklen_t_value@ apr_socklen_t; 360typedef @ino_t_value@ apr_ino_t; 361 362#if APR_SIZEOF_VOIDP == 8 363typedef apr_uint64_t apr_uintptr_t; 364#else 365typedef apr_uint32_t apr_uintptr_t; 366#endif 367 368/* Are we big endian? */ 369#define APR_IS_BIGENDIAN @bigendian@ 370 | 377#endif 378 379typedef @size_t_value@ apr_size_t; 380typedef @ssize_t_value@ apr_ssize_t; 381typedef @off_t_value@ apr_off_t; 382typedef @socklen_t_value@ apr_socklen_t; 383typedef @ino_t_value@ apr_ino_t; 384 385#if APR_SIZEOF_VOIDP == 8 386typedef apr_uint64_t apr_uintptr_t; 387#else 388typedef apr_uint32_t apr_uintptr_t; 389#endif 390 391/* Are we big endian? */ 392#define APR_IS_BIGENDIAN @bigendian@ 393 |
| 371/* Mechanisms to properly type numeric literals */ 372@int64_literal@ 373@uint64_literal@ 374 | |
| 375#ifdef INT16_MIN 376#define APR_INT16_MIN INT16_MIN 377#else 378#define APR_INT16_MIN (-0x7fff - 1) 379#endif 380 381#ifdef INT16_MAX 382#define APR_INT16_MAX INT16_MAX --- 255 unchanged lines hidden --- | 394#ifdef INT16_MIN 395#define APR_INT16_MIN INT16_MIN 396#else 397#define APR_INT16_MIN (-0x7fff - 1) 398#endif 399 400#ifdef INT16_MAX 401#define APR_INT16_MAX INT16_MAX --- 255 unchanged lines hidden --- |