summaryrefslogtreecommitdiff
path: root/include/private
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2009-12-17 19:13:49 +0000
committerWilliam A. Rowe Jr <wrowe@apache.org>2009-12-17 19:13:49 +0000
commit79f0e131c17cd22796b90875aed1ad58eaf51637 (patch)
treed0d489ed57bd8acbd9844547b83d110e791cbd68 /include/private
parentb517a0fa47a6374a751092d6fdb2add7aa8f2651 (diff)
downloadapr-79f0e131c17cd22796b90875aed1ad58eaf51637.tar.gz
The expat-way of doing things to the expat lib, rather than our own xml.lib
The other whitespace and functional win32 changes are going away altogether as apu_config.h is dropped. The apu.hnw change was immediately reverted. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@891846 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/private')
-rw-r--r--include/private/apu_config.hw8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/private/apu_config.hw b/include/private/apu_config.hw
index a4d9e3149..eb6ba4ca2 100644
--- a/include/private/apu_config.hw
+++ b/include/private/apu_config.hw
@@ -24,9 +24,12 @@
#ifndef APU_CONFIG_H
#define APU_CONFIG_H
-/* Compile win32 with DSO support for .dll builds */
+/* Compile win32 with DSO support for .dll builds
+ * Pair the static xml build for static apr-2.lib
+ */
#ifdef APR_DECLARE_STATIC
#define APU_DSO_BUILD 0
+#define XML_STATIC 1
#else
#define APU_DSO_BUILD 1
#endif
@@ -37,6 +40,9 @@
/* my_sys.h is broken on VC/Win32, and apparently not required */
/* #undef HAVE_MY_SYS_H 0 */
+/* Windows ODBC sql.h is always present */
+#define HAVE_SQL_H 1
+
/*
* Windows does not have GDBM, and we always use the bundled (new) Expat
*/