diff options
| author | peter <peter@FreeBSD.org> | 2013-07-28 06:02:40 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2013-07-28 06:02:40 +0000 |
| commit | 0aadc82afbae4dbc41da86cd4f9b2ceb8ddcb17d (patch) | |
| tree | 6a96e078c28ea05d418b4e2722bc03b0b930a78b /usr.bin/svn/lib | |
| parent | 7594fa5c70305cda65deedc5cc7e08dc037727cd (diff) | |
| parent | b910f82d487cf989800adbd1a65b3a7f71b46277 (diff) | |
| download | FreeBSD-src-0aadc82afbae4dbc41da86cd4f9b2ceb8ddcb17d.zip FreeBSD-src-0aadc82afbae4dbc41da86cd4f9b2ceb8ddcb17d.tar.gz | |
Update subversion-1.8.0 -> 1.8.1. Update supporting
components: apr-1.4.6 -> 1.4.8 and apr-util-1.4.1 -> 1.5.2.
This is a post point-zero bug-fix / fix-sharp-edges release, including
some workarounds for UTF-8 for people who haven't yet turned on WITH_ICONV.
Diffstat (limited to 'usr.bin/svn/lib')
| -rw-r--r-- | usr.bin/svn/lib/libapr_util/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/svn/lib/libapr_util/apu.h | 14 |
2 files changed, 16 insertions, 2 deletions
diff --git a/usr.bin/svn/lib/libapr_util/Makefile b/usr.bin/svn/lib/libapr_util/Makefile index 4d82443..4f25e8f 100644 --- a/usr.bin/svn/lib/libapr_util/Makefile +++ b/usr.bin/svn/lib/libapr_util/Makefile @@ -10,10 +10,10 @@ SRCS= apr_base64.c apr_brigade.c apr_buckets.c apr_buckets_alloc.c \ apr_buckets_heap.c apr_buckets_mmap.c apr_buckets_pipe.c \ apr_buckets_pool.c apr_buckets_refcount.c apr_buckets_simple.c \ apr_buckets_socket.c apr_crypto.c apr_date.c apr_dbd.c \ - apr_hooks.c apr_md4.c apr_md5.c apr_memcache.c \ + apr_hooks.c apr_md4.c apr_md5.c apr_memcache.c apr_passwd.c \ apr_queue.c apr_reslist.c apr_rmm.c apr_sha1.c apr_strmatch.c \ apr_thread_pool.c apr_uri.c apr_xml.c apu_dso.c apu_version.c \ - getuuid.c uuid.c xlate.c + crypt_blowfish.c getuuid.c uuid.c xlate.c .PATH: ${APRU}/buckets ${APRU}/crypto ${APRU}/dbd \ ${APRU}/encoding ${APRU}/hooks \ diff --git a/usr.bin/svn/lib/libapr_util/apu.h b/usr.bin/svn/lib/libapr_util/apu.h index ea090bf..639cec4 100644 --- a/usr.bin/svn/lib/libapr_util/apu.h +++ b/usr.bin/svn/lib/libapr_util/apu.h @@ -43,6 +43,7 @@ * conventions at compile time. */ +#if defined(DOXYGEN) || !defined(WIN32) /** * The public APR-UTIL functions are declared with APU_DECLARE(), so they may * use the most appropriate calling convention. Public APR functions with @@ -67,6 +68,19 @@ * declarations within headers to properly import the variable. */ #define APU_DECLARE_DATA +#elif defined(APU_DECLARE_STATIC) +#define APU_DECLARE(type) type __stdcall +#define APU_DECLARE_NONSTD(type) type __cdecl +#define APU_DECLARE_DATA +#elif defined(APU_DECLARE_EXPORT) +#define APU_DECLARE(type) __declspec(dllexport) type __stdcall +#define APU_DECLARE_NONSTD(type) __declspec(dllexport) type __cdecl +#define APU_DECLARE_DATA __declspec(dllexport) +#else +#define APU_DECLARE(type) __declspec(dllimport) type __stdcall +#define APU_DECLARE_NONSTD(type) __declspec(dllimport) type __cdecl +#define APU_DECLARE_DATA __declspec(dllimport) +#endif #if !defined(WIN32) || defined(APU_MODULE_DECLARE_STATIC) /** |
