diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2015-08-09 05:15:28 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2015-08-09 05:15:28 +0000 |
| commit | 15cc9ee534c13db37dac4279f76923224e123098 (patch) | |
| tree | 0ea268737be6ac3e78b8945c1f53c2afe17463b4 /usr.bin/svn | |
| parent | 84a48fac948e7879d70aaa6e5527e20182142cc9 (diff) | |
| download | src-15cc9ee534c13db37dac4279f76923224e123098.tar.gz src-15cc9ee534c13db37dac4279f76923224e123098.zip | |
Notes
Diffstat (limited to 'usr.bin/svn')
| -rw-r--r-- | usr.bin/svn/lib/libapr_util/apu.h | 10 | ||||
| -rw-r--r-- | usr.bin/svn/lib/libapr_util/apu_config.h | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/usr.bin/svn/lib/libapr_util/apu.h b/usr.bin/svn/lib/libapr_util/apu.h index 639cec46f9d9..29a5dd19ada8 100644 --- a/usr.bin/svn/lib/libapr_util/apu.h +++ b/usr.bin/svn/lib/libapr_util/apu.h @@ -117,16 +117,12 @@ #define APU_HAVE_FREETDS 0 #define APU_HAVE_ODBC 0 -#define APU_HAVE_CRYPTO 0 -#define APU_HAVE_OPENSSL 0 +#define APU_HAVE_CRYPTO 1 +#define APU_HAVE_OPENSSL 1 #define APU_HAVE_NSS 0 -#ifndef APU_HAVE_APR_ICONV #define APU_HAVE_APR_ICONV 0 -#endif -#ifndef APU_HAVE_ICONV -#define APU_HAVE_ICONV 0 -#endif +#define APU_HAVE_ICONV 1 #define APR_HAS_XLATE (APU_HAVE_APR_ICONV || APU_HAVE_ICONV) #endif /* APU_H */ diff --git a/usr.bin/svn/lib/libapr_util/apu_config.h b/usr.bin/svn/lib/libapr_util/apu_config.h index 78a70653234b..5492454caaad 100644 --- a/usr.bin/svn/lib/libapr_util/apu_config.h +++ b/usr.bin/svn/lib/libapr_util/apu_config.h @@ -13,7 +13,7 @@ /* #undef APU_DSO_LIBDIR */ /* Define if the inbuf parm to iconv() is const char ** */ -#define APU_ICONV_INBUF_CONST 1 +/* #undef APU_ICONV_INBUF_CONST */ /* Define that OpenSSL uses const buffers */ #define CRYPTO_OPENSSL_CONST_BUFFERS 1 @@ -41,7 +41,7 @@ /* #undef HAVE_FREETDS_SYBDB_H */ /* Define to 1 if you have the <iconv.h> header file. */ -/* #undef HAVE_ICONV_H */ +#define HAVE_ICONV_H 1 /* Define to 1 if you have the <inttypes.h> header file. */ #define HAVE_INTTYPES_H 1 |