mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-06 00:20:29 +00:00
Update backend files and makefiles for apr 1.4.8 -> 1.5.1
This commit is contained in:
parent
228f8555ff
commit
b924fc0363
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=266736
|
@ -4,7 +4,7 @@
|
|||
|
||||
INTERNALLIB= yes
|
||||
LIB= apr
|
||||
SRCS= apr_cpystrn.c apr_fnmatch.c apr_getpass.c apr_hash.c \
|
||||
SRCS= apr_cpystrn.c apr_fnmatch.c apr_getpass.c apr_hash.c apr_skiplist.c \
|
||||
apr_pools.c apr_random.c apr_snprintf.c apr_strings.c \
|
||||
apr_strnatcmp.c apr_strtok.c apr_tables.c buffer.c \
|
||||
builtins.c charset.c common.c copy.c dir.c dso.c env.c \
|
||||
|
@ -18,7 +18,7 @@ SRCS= apr_cpystrn.c apr_fnmatch.c apr_getpass.c apr_hash.c \
|
|||
shm.c signals.c sockaddr.c socket_util.c sockets.c \
|
||||
sockopt.c solaris.c start.c tempdir.c thread.c thread_cond.c \
|
||||
thread_mutex.c thread_rwlock.c threadpriv.c time.c \
|
||||
timestr.c userinfo.c version.c waitio.c
|
||||
timestr.c userinfo.c version.c waitio.c z_asio.c
|
||||
|
||||
.PATH: ${APR}/atomic/unix ${APR}/dso/unix ${APR}/file_io/unix \
|
||||
${APR}/locks/unix ${APR}/memory/unix ${APR}/misc/unix \
|
||||
|
|
|
@ -118,7 +118,7 @@
|
|||
* or the extern "C" namespace
|
||||
*/
|
||||
|
||||
#if APR_HAVE_WINDOWS_H
|
||||
#if APR_HAVE_WINDOWS_H && defined(WIN32)
|
||||
/* If windows.h was already included, our preferences don't matter.
|
||||
* If not, include a restricted set of windows headers to our tastes.
|
||||
*/
|
||||
|
@ -466,6 +466,8 @@ typedef apr_uint32_t apr_uintptr_t;
|
|||
*/
|
||||
#define APR_THREAD_FUNC
|
||||
|
||||
#if defined(DOXYGEN) || !defined(WIN32)
|
||||
|
||||
/**
|
||||
* The public APR functions are declared with APR_DECLARE(), so they may
|
||||
* use the most appropriate calling convention. Public APR functions with
|
||||
|
@ -518,6 +520,20 @@ typedef apr_uint32_t apr_uintptr_t;
|
|||
*/
|
||||
#define APR_DECLARE_DATA
|
||||
|
||||
#elif defined(APR_DECLARE_STATIC)
|
||||
#define APR_DECLARE(type) type __stdcall
|
||||
#define APR_DECLARE_NONSTD(type) type __cdecl
|
||||
#define APR_DECLARE_DATA
|
||||
#elif defined(APR_DECLARE_EXPORT)
|
||||
#define APR_DECLARE(type) __declspec(dllexport) type __stdcall
|
||||
#define APR_DECLARE_NONSTD(type) __declspec(dllexport) type __cdecl
|
||||
#define APR_DECLARE_DATA __declspec(dllexport)
|
||||
#else
|
||||
#define APR_DECLARE(type) __declspec(dllimport) type __stdcall
|
||||
#define APR_DECLARE_NONSTD(type) __declspec(dllimport) type __cdecl
|
||||
#define APR_DECLARE_DATA __declspec(dllimport)
|
||||
#endif
|
||||
|
||||
/* Define APR_SSIZE_T_FMT.
|
||||
* If ssize_t is an integer we define it to be "d",
|
||||
* if ssize_t is a long int we define it to be "ld",
|
||||
|
|
|
@ -86,6 +86,9 @@
|
|||
/* Define if accept4 function is supported */
|
||||
#define HAVE_ACCEPT4 1
|
||||
|
||||
/* Define if async i/o supports message q's */
|
||||
/* #undef HAVE_AIO_MSGQ */
|
||||
|
||||
/* Define to 1 if you have `alloca', as a function or macro. */
|
||||
#define HAVE_ALLOCA 1
|
||||
|
||||
|
@ -142,7 +145,7 @@
|
|||
/* #undef HAVE_DL_H */
|
||||
|
||||
/* Define if dup3 function is supported */
|
||||
/* #undef HAVE_DUP3 */
|
||||
#define HAVE_DUP3 1
|
||||
|
||||
/* Define if EGD is supported */
|
||||
/* #undef HAVE_EGD */
|
||||
|
@ -934,7 +937,7 @@
|
|||
|
||||
|
||||
/* switch this on if we have a BeOS version below BONE */
|
||||
#if BEOS && !HAVE_BONE_VERSION
|
||||
#if defined(BEOS) && !defined(HAVE_BONE_VERSION)
|
||||
#define BEOS_R5 1
|
||||
#else
|
||||
#define BEOS_BONE 1
|
||||
|
|
Loading…
Reference in a new issue