Index: head/usr.bin/svn/lib/libapr_util/apu.h =================================================================== --- head/usr.bin/svn/lib/libapr_util/apu.h (revision 286503) +++ head/usr.bin/svn/lib/libapr_util/apu.h (revision 286504) @@ -1,133 +1,129 @@ /* $FreeBSD$ */ /* Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ /* * apu.h is generated from apu.h.in by configure -- do not edit apu.h */ /* @file apu.h * @brief APR-Utility main file */ /** * @defgroup APR_Util APR Utility Functions * @{ */ #ifndef APU_H #define APU_H /** * APU_DECLARE_EXPORT is defined when building the APR-UTIL dynamic library, * so that all public symbols are exported. * * APU_DECLARE_STATIC is defined when including the APR-UTIL public headers, * to provide static linkage when the dynamic library may be unavailable. * * APU_DECLARE_STATIC and APU_DECLARE_EXPORT are left undefined when * including the APR-UTIL public headers, to import and link the symbols from * the dynamic APR-UTIL library and assure appropriate indirection and calling * 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 * variable arguments must use APU_DECLARE_NONSTD(). * * @fn APU_DECLARE(rettype) apr_func(args); */ #define APU_DECLARE(type) type /** * The public APR-UTIL functions using variable arguments are declared with * APU_DECLARE_NONSTD(), as they must use the C language calling convention. * * @fn APU_DECLARE_NONSTD(rettype) apr_func(args, ...); */ #define APU_DECLARE_NONSTD(type) type /** * The public APR-UTIL variables are declared with APU_DECLARE_DATA. * This assures the appropriate indirection is invoked at compile time. * * @fn APU_DECLARE_DATA type apr_variable; * @note APU_DECLARE_DATA extern type apr_variable; syntax is required for * 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) /** * Declare a dso module's exported module structure as APU_MODULE_DECLARE_DATA. * * Unless APU_MODULE_DECLARE_STATIC is defined at compile time, symbols * declared with APU_MODULE_DECLARE_DATA are always exported. * @code * module APU_MODULE_DECLARE_DATA mod_tag * @endcode */ #define APU_MODULE_DECLARE_DATA #else #define APU_MODULE_DECLARE_DATA __declspec(dllexport) #endif /* * we always have SDBM (it's in our codebase) */ #define APU_HAVE_SDBM 1 #define APU_HAVE_GDBM 0 #define APU_HAVE_NDBM 0 #define APU_HAVE_DB 0 #if APU_HAVE_DB #define APU_HAVE_DB_VERSION 0 #endif #define APU_HAVE_PGSQL 0 #define APU_HAVE_MYSQL 0 #define APU_HAVE_SQLITE3 0 #define APU_HAVE_SQLITE2 0 #define APU_HAVE_ORACLE 0 #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 */ /** @} */ Index: head/usr.bin/svn/lib/libapr_util/apu_config.h =================================================================== --- head/usr.bin/svn/lib/libapr_util/apu_config.h (revision 286503) +++ head/usr.bin/svn/lib/libapr_util/apu_config.h (revision 286504) @@ -1,179 +1,179 @@ /* $FreeBSD$ */ /* include/private/apu_config.h. Generated from apu_config.h.in by configure. */ /* include/private/apu_config.h.in. Generated from configure.in by autoheader. */ /* Define if the system crypt() function is threadsafe */ /* #undef APU_CRYPT_THREADSAFE */ /* Define to 1 if modular components are built as DSOs */ /* #undef APU_DSO_BUILD */ /* Define to be absolute path to DSO directory */ /* #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 /* Define if crypt_r has uses CRYPTD */ /* #undef CRYPT_R_CRYPTD */ /* Define if crypt_r uses struct crypt_data */ /* #undef CRYPT_R_STRUCT_CRYPT_DATA */ /* Define if CODESET is defined in langinfo.h */ #define HAVE_CODESET 1 /* Define to 1 if you have the `crypt_r' function. */ /* #undef HAVE_CRYPT_R */ /* Define to 1 if you have the declaration of `EVP_PKEY_CTX_new', and to 0 if you don't. */ #define HAVE_DECL_EVP_PKEY_CTX_NEW 1 /* Define if expat.h is available */ #define HAVE_EXPAT_H 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_FREETDS_SYBDB_H */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_ICONV_H */ +#define HAVE_ICONV_H 1 /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 /* Define to 1 if you have the header file. */ #define HAVE_LANGINFO_H 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_LBER_H */ /* Defined if ldap.h is present */ /* #undef HAVE_LDAP_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_LDAP_SSL_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_LIBPQ_FE_H */ /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_MYSQL_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_MYSQL_MYSQL_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_MYSQL_MY_GLOBAL_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_MYSQL_MY_SYS_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_MY_GLOBAL_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_MY_SYS_H */ /* Define to 1 if you have the `nl_langinfo' function. */ #define HAVE_NL_LANGINFO 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_NSS_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_NSS_NSS_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_NSS_PK11PUB_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_OCI_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_ODBC_SQL_H */ /* Define to 1 if you have the header file. */ #define HAVE_OPENSSL_X509_H 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_PK11PUB_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_POSTGRESQL_LIBPQ_FE_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_PRERROR_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_SQLITE3_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_SQLITE_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_SQL_H */ /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STRINGS_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_SYBDB_H */ /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_TYPES_H 1 /* Define to 1 if you have the header file. */ #define HAVE_UNISTD_H 1 /* Define if xmlparse/xmlparse.h is available */ /* #undef HAVE_XMLPARSE_XMLPARSE_H */ /* Define if xmltok/xmlparse.h is available */ /* #undef HAVE_XMLTOK_XMLPARSE_H */ /* Define if xml/xmlparse.h is available */ /* #undef HAVE_XML_XMLPARSE_H */ /* Define if ldap_set_rebind_proc takes three arguments */ /* #undef LDAP_SET_REBIND_PROC_THREE */ /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "" /* Define to the full name of this package. */ #define PACKAGE_NAME "" /* Define to the full name and version of this package. */ #define PACKAGE_STRING "" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "" /* Define to the home page for this package. */ #define PACKAGE_URL "" /* Define to the version of this package. */ #define PACKAGE_VERSION "" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1