Date: Mon, 1 Jun 2020 10:08:18 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361691 - head/usr.bin/svn/lib/libapr Message-ID: <202006011008.051A8IsE065465@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Mon Jun 1 10:08:18 2020 New Revision: 361691 URL: https://svnweb.freebsd.org/changeset/base/361691 Log: Follow-up r361678 (update apr to 1.7.0) by also regenerating the apr internal headers through the upstream configure script, with some minor custom tweaks. MFC after: 2 weeks X-MFC-With: r361677 Modified: head/usr.bin/svn/lib/libapr/apr.h head/usr.bin/svn/lib/libapr/apr_private.h Modified: head/usr.bin/svn/lib/libapr/apr.h ============================================================================== --- head/usr.bin/svn/lib/libapr/apr.h Mon Jun 1 09:15:15 2020 (r361690) +++ head/usr.bin/svn/lib/libapr/apr.h Mon Jun 1 10:08:18 2020 (r361691) @@ -95,6 +95,7 @@ #define APR_HAVE_STDLIB_H 1 #define APR_HAVE_STRING_H 1 #define APR_HAVE_STRINGS_H 1 +#define APR_HAVE_INTTYPES_H 1 #define APR_HAVE_SYS_IOCTL_H 1 #define APR_HAVE_SYS_SENDFILE_H 0 #define APR_HAVE_SYS_SIGNAL_H 1 @@ -170,16 +171,25 @@ #include <sys/socket.h> #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 * and UINT64_C for C++ implementations if this is defined: */ +#ifndef __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS #endif - -#if APR_HAVE_STDINT_H +/* C++ needs this too for PRI*NN formats: */ +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS +#endif +#endif /* __cplusplus */ #include <stdint.h> #endif +#if APR_HAVE_INTTYPES_H +#include <inttypes.h> +#endif + #if APR_HAVE_SYS_WAIT_H #include <sys/wait.h> #endif @@ -199,6 +209,13 @@ #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 extern "C" { @@ -219,10 +236,10 @@ extern "C" { #define APR_HAVE_SHMEM_BEOS 0 #define APR_USE_SHMEM_MMAP_TMP 0 -#define APR_USE_SHMEM_MMAP_SHM 1 +#define APR_USE_SHMEM_MMAP_SHM 0 #define APR_USE_SHMEM_MMAP_ZERO 0 #define APR_USE_SHMEM_SHMGET_ANON 0 -#define APR_USE_SHMEM_SHMGET 0 +#define APR_USE_SHMEM_SHMGET 1 #define APR_USE_SHMEM_MMAP_ANON 1 #define APR_USE_SHMEM_BEOS 0 @@ -237,7 +254,7 @@ extern "C" { #define APR_HAS_SYSVSEM_SERIALIZE 1 #define APR_HAS_POSIXSEM_SERIALIZE 1 #define APR_HAS_FCNTL_SERIALIZE 1 -#define APR_HAS_PROC_PTHREAD_SERIALIZE 0 +#define APR_HAS_PROC_PTHREAD_SERIALIZE 1 #define APR_PROCESS_LOCK_IS_GLOBAL 0 @@ -247,6 +264,7 @@ extern "C" { #define APR_HAVE_INET_ADDR 1 #define APR_HAVE_INET_NETWORK 1 #define APR_HAVE_IPV6 1 +#define APR_HAVE_SOCKADDR_UN 1 #define APR_HAVE_MEMMOVE 1 #define APR_HAVE_SETRLIMIT 1 #define APR_HAVE_SIGACTION 1 @@ -273,7 +291,7 @@ extern "C" { #define APR_HAS_FORK 1 #define APR_HAS_RANDOM 1 #define APR_HAS_OTHER_CHILD 1 -#define APR_HAS_DSO 0 +#define APR_HAS_DSO 1 #define APR_HAS_SO_ACCEPTFILTER 1 #define APR_HAS_UNICODE_FS 0 #define APR_HAS_PROC_INVOKED 0 @@ -281,6 +299,7 @@ extern "C" { #define APR_HAS_LARGE_FILES 0 #define APR_HAS_XTHREAD_FILES 0 #define APR_HAS_OS_UUID 1 +#define APR_HAS_TIMEDLOCKS 1 #define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 0 @@ -340,31 +359,35 @@ typedef unsigned int apr_uint32_t; */ #ifdef DARWIN_10 #undef APR_SIZEOF_VOIDP -#undef INT64_C -#undef UINT64_C +#undef APR_INT64_C +#undef APR_UINT64_C #ifdef __LP64__ typedef long apr_int64_t; typedef unsigned long apr_uint64_t; #define APR_SIZEOF_VOIDP 8 - #define INT64_C(v) (v ## L) - #define UINT64_C(v) (v ## UL) + #define APR_INT64_C(v) (v ## L) + #define APR_UINT64_C(v) (v ## UL) #else typedef long long apr_int64_t; typedef unsigned long long apr_uint64_t; #define APR_SIZEOF_VOIDP 4 - #define INT64_C(v) (v ## LL) - #define UINT64_C(v) (v ## ULL) + #define APR_INT64_C(v) (v ## LL) + #define APR_UINT64_C(v) (v ## ULL) #endif #else typedef __int64_t apr_int64_t; typedef __uint64_t apr_uint64_t; + + /* Mechanisms to properly type numeric literals */ + #define APR_INT64_C(val) INT64_C(val) + #define APR_UINT64_C(val) UINT64_C(val) #endif typedef size_t apr_size_t; typedef ssize_t apr_ssize_t; typedef off_t apr_off_t; typedef socklen_t apr_socklen_t; -typedef unsigned int apr_ino_t; +typedef __ino_t apr_ino_t; #if APR_SIZEOF_VOIDP == 8 typedef apr_uint64_t apr_uintptr_t; @@ -380,10 +403,6 @@ typedef apr_uint32_t apr_uintptr_t; #else #error Unknown byte order. #endif - -/* Mechanisms to properly type numeric literals */ -#define APR_INT64_C(val) INT64_C(val) -#define APR_UINT64_C(val) UINT64_C(val) #ifdef INT16_MIN #define APR_INT16_MIN INT16_MIN Modified: head/usr.bin/svn/lib/libapr/apr_private.h ============================================================================== --- head/usr.bin/svn/lib/libapr/apr_private.h Mon Jun 1 09:15:15 2020 (r361690) +++ head/usr.bin/svn/lib/libapr/apr_private.h Mon Jun 1 10:08:18 2020 (r361691) @@ -11,6 +11,9 @@ /* Define if building universal (internal helper macro) */ /* #undef AC_APPLE_UNIVERSAL_BUILD */ +/* Define if apr_allocator should use guard pages */ +/* #undef APR_ALLOCATOR_GUARD_PAGES */ + /* Define if apr_allocator should use mmap */ /* #undef APR_ALLOCATOR_USES_MMAP */ @@ -21,6 +24,9 @@ /* Define as function used for conversion of strings to apr_off_t */ #define APR_OFF_T_STRFN strtol +/* Define if pool functions should abort if concurrent usage is detected */ +/* #undef APR_POOL_CONCURRENCY_CHECK */ + /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. */ @@ -30,7 +36,7 @@ /* #undef C_ALLOCA */ /* Define to path of random device */ -#define DEV_RANDOM "/dev/urandom" +/* #undef DEV_RANDOM */ /* Define if struct dirent has an inode member */ #define DIRENT_INODE d_fileno @@ -39,7 +45,7 @@ #define DIRENT_TYPE d_type /* Define if DSO support uses dlfcn.h */ -/* #undef DSO_USE_DLFCN */ +#define DSO_USE_DLFCN 1 /* Define if DSO support uses dyld.h */ /* #undef DSO_USE_DYLD */ @@ -86,6 +92,12 @@ /* Define if accept4 function is supported */ #define HAVE_ACCEPT4 1 +/* Define to 1 if you have the `acquire_sem' function. */ +/* #undef HAVE_ACQUIRE_SEM */ + +/* Define to 1 if you have the `acquire_sem_etc' function. */ +/* #undef HAVE_ACQUIRE_SEM_ETC */ + /* Define if async i/o supports message q's */ /* #undef HAVE_AIO_MSGQ */ @@ -96,6 +108,9 @@ */ /* #undef HAVE_ALLOCA_H */ +/* Define to 1 if you have the `arc4random_buf' function. */ +#define HAVE_ARC4RANDOM_BUF 1 + /* Define to 1 if you have the <arpa/inet.h> header file. */ #define HAVE_ARPA_INET_H 1 @@ -128,6 +143,10 @@ /* Define to 1 if you have the <ctype.h> header file. */ #define HAVE_CTYPE_H 1 +/* Define to 1 if you have the declaration of `SYS_getrandom', and to 0 if you + don't. */ +#define HAVE_DECL_SYS_GETRANDOM 1 + /* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you don't. */ #define HAVE_DECL_SYS_SIGLIST 1 @@ -163,7 +182,7 @@ #define HAVE_FCNTL_H 1 /* Define to 1 if you have the `fdatasync' function. */ -/* #undef HAVE_FDATASYNC */ +#define HAVE_FDATASYNC 1 /* Define to 1 if you have the `flock' function. */ #define HAVE_FLOCK 1 @@ -216,6 +235,9 @@ /* Define to 1 if you have the `getpwuid_r' function. */ #define HAVE_GETPWUID_R 1 +/* Define to 1 if you have the `getrandom' function. */ +#define HAVE_GETRANDOM 1 + /* Define to 1 if you have the `getrlimit' function. */ #define HAVE_GETRLIMIT 1 @@ -231,6 +253,12 @@ /* Define if hstrerror is present */ /* #undef HAVE_HSTRERROR */ +/* Define to 1 if you have the `if_indextoname' function. */ +#define HAVE_IF_INDEXTONAME 1 + +/* Define to 1 if you have the `if_nametoindex' function. */ +#define HAVE_IF_NAMETOINDEX 1 + /* Define to 1 if you have the <inttypes.h> header file. */ #define HAVE_INTTYPES_H 1 @@ -264,6 +292,9 @@ /* Define to 1 if you have the <limits.h> header file. */ #define HAVE_LIMITS_H 1 +/* Define to 1 if you have the <linux/random.h> header file. */ +/* #undef HAVE_LINUX_RANDOM_H */ + /* Define to 1 if you have the `localtime_r' function. */ #define HAVE_LOCALTIME_R 1 @@ -279,6 +310,9 @@ /* Define if MAP_ANON is defined in sys/mman.h */ #define HAVE_MAP_ANON 1 +/* Define to 1 if you have the <memcheck.h> header file. */ +/* #undef HAVE_MEMCHECK_H */ + /* Define to 1 if you have the `memchr' function. */ #define HAVE_MEMCHR 1 @@ -300,6 +334,9 @@ /* Define to 1 if you have the `mmap64' function. */ /* #undef HAVE_MMAP64 */ +/* Define to 1 if you have the `mprotect' function. */ +#define HAVE_MPROTECT 1 + /* Define to 1 if you have the `munmap' function. */ #define HAVE_MUNMAP 1 @@ -321,6 +358,9 @@ /* Define to 1 if you have the <net/errno.h> header file. */ /* #undef HAVE_NET_ERRNO_H */ +/* Define to 1 if you have the <net/if.h> header file. */ +#define HAVE_NET_IF_H 1 + /* Define to 1 if you have the `nl_langinfo' function. */ #define HAVE_NL_LANGINFO 1 @@ -351,6 +391,9 @@ /* Define to 1 if you have the `pthread_attr_setguardsize' function. */ #define HAVE_PTHREAD_ATTR_SETGUARDSIZE 1 +/* Define to 1 if you have the `pthread_condattr_setpshared' function. */ +#define HAVE_PTHREAD_CONDATTR_SETPSHARED 1 + /* Define to 1 if you have the <pthread.h> header file. */ #define HAVE_PTHREAD_H 1 @@ -364,8 +407,14 @@ #define HAVE_PTHREAD_MUTEX_RECURSIVE 1 /* Define if cross-process robust mutexes are available */ -/* #undef HAVE_PTHREAD_MUTEX_ROBUST */ +#define HAVE_PTHREAD_MUTEX_ROBUST 1 +/* Define if non-posix/portable cross-process robust mutexes are available */ +/* #undef HAVE_PTHREAD_MUTEX_ROBUST_NP */ + +/* Define to 1 if you have the `pthread_mutex_timedlock' function. */ +#define HAVE_PTHREAD_MUTEX_TIMEDLOCK 1 + /* Define if PTHREAD_PROCESS_SHARED is defined in pthread.h */ #define HAVE_PTHREAD_PROCESS_SHARED 1 @@ -402,12 +451,21 @@ /* Define to 1 if you have the `semget' function. */ #define HAVE_SEMGET 1 +/* Define to 1 if you have the `semop' function. */ +#define HAVE_SEMOP 1 + +/* Define to 1 if you have the `semtimedop' function. */ +/* #undef HAVE_SEMTIMEDOP */ + /* Define to 1 if you have the `sem_close' function. */ #define HAVE_SEM_CLOSE 1 /* Define to 1 if you have the `sem_post' function. */ #define HAVE_SEM_POST 1 +/* Define to 1 if you have the `sem_timedwait' function. */ +#define HAVE_SEM_TIMEDWAIT 1 + /* Define if SEM_UNDO is defined in sys/sem.h */ #define HAVE_SEM_UNDO 1 @@ -591,6 +649,9 @@ /* Define to 1 if you have the <sys/poll.h> header file. */ #define HAVE_SYS_POLL_H 1 +/* Define to 1 if you have the <sys/random.h> header file. */ +#define HAVE_SYS_RANDOM_H 1 + /* Define to 1 if you have the <sys/resource.h> header file. */ #define HAVE_SYS_RESOURCE_H 1 @@ -618,6 +679,9 @@ /* Define to 1 if you have the <sys/stat.h> header file. */ #define HAVE_SYS_STAT_H 1 +/* Define to 1 if you have the <sys/syscall.h> header file. */ +#define HAVE_SYS_SYSCALL_H 1 + /* Define to 1 if you have the <sys/sysctl.h> header file. */ #define HAVE_SYS_SYSCTL_H 1 @@ -693,6 +757,12 @@ /* Define to 1 if you have the <uuid/uuid.h> header file. */ /* #undef HAVE_UUID_UUID_H */ +/* Compile in valgrind support */ +/* #undef HAVE_VALGRIND */ + +/* Define to 1 if you have the <valgrind.h> header file. */ +/* #undef HAVE_VALGRIND_H */ + /* Define if C compiler supports VLA */ #define HAVE_VLA 1 @@ -711,8 +781,7 @@ /* Define for z/OS pthread API nuances */ /* #undef HAVE_ZOS_PTHREADS */ -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #define LT_OBJDIR ".libs/" /* Define if EAI_ error codes from getaddrinfo are negative */ @@ -748,8 +817,8 @@ /* Define if pthread_getspecific() has two args */ /* #undef PTHREAD_GETSPECIFIC_TAKES_TWO_ARGS */ -/* Define if readdir is thread safe */ -/* #undef READDIR_IS_THREAD_SAFE */ +/* Modern readdir is thread safe */ +#define READDIR_IS_THREAD_SAFE 1 /* Define to 1 if the `setpgrp' function takes no argument. */ /* #undef SETPGRP_VOID */ @@ -761,7 +830,11 @@ #define SIZEOF_CHAR 1 /* The size of ino_t */ +#if __FreeBSD__ >= 12 +#define SIZEOF_INO_T 8 +#else #define SIZEOF_INO_T 4 +#endif /* The size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 @@ -810,6 +883,9 @@ /* Define if SysV semaphores affect threads within the process */ /* #undef SYSVSEM_IS_GLOBAL */ +/* Define system call of random */ +#define SYS_RANDOM "getrandom" + /* Define if use of generic atomics is requested */ /* #undef USE_ATOMICS_GENERIC */ @@ -822,6 +898,9 @@ /* Define if 4.2BSD-style flock() will be used */ #define USE_FLOCK_SERIALIZE 1 +/* Define if pthread pshared mutex will be used */ +/* #undef USE_PROC_PTHREAD_SERIALIZE */ + /* Define if BeOS areas will be used */ /* #undef USE_SHMEM_BEOS */ @@ -832,7 +911,7 @@ #define USE_SHMEM_MMAP_ANON 1 /* Define if mmap() via POSIX.1 shm_open() on temporary file will be used */ -#define USE_SHMEM_MMAP_SHM 1 +/* #undef USE_SHMEM_MMAP_SHM */ /* Define if Classical mmap() on temporary file will be used */ /* #undef USE_SHMEM_MMAP_TMP */ @@ -847,7 +926,7 @@ /* #undef USE_SHMEM_OS2_ANON */ /* Define if SysV IPC shmget() will be used */ -/* #undef USE_SHMEM_SHMGET */ +#define USE_SHMEM_SHMGET 1 /* Define if SysV IPC shmget() will be used */ /* #undef USE_SHMEM_SHMGET_ANON */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006011008.051A8IsE065465>