Permit us to use very Win32 specific i18n macros and extensions so that

  registry, services and so forth can share well tested code.  They are
  still not for general consumption, only for writing apr-like wrappers.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63520 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 3 insertions, 3 deletions

diff --git a/include/arch/win32/fileio.h b/include/arch/win32/fileio.h
index 2cf398995..b0bb3acd0 100644
--- a/include/arch/win32/fileio.h
+++ b/include/arch/win32/fileio.h
@@ -86,7 +86,7 @@
 #endif
 
 #if APR_HAS_UNICODE_FS
-#include "i18n.h"
+#include "arch/unix/i18n.h"
 #include <wchar.h>
 
 typedef apr_uint16_t apr_wchar_t;
diff --git a/include/arch/win32/misc.h b/include/arch/win32/misc.h
index 072dad16b..68e636afd 100644
--- a/include/arch/win32/misc.h
+++ b/include/arch/win32/misc.h
@@ -141,7 +141,7 @@ typedef enum {
         APR_WIN_XP =       60
 } apr_oslevel_e;
 
-extern apr_oslevel_e apr_os_level;
+extern APR_DECLARE_DATA apr_oslevel_e apr_os_level;
 
 apr_status_t apr_get_oslevel(struct apr_pool_t *, apr_oslevel_e *);
 
diff --git a/misc/win32/misc.c b/misc/win32/misc.c
index 39a8b5d7d..38a6f2662 100644
--- a/misc/win32/misc.c
+++ b/misc/win32/misc.c
@@ -59,7 +59,7 @@
 #include "assert.h"
 #include "apr_lib.h"
 
-apr_oslevel_e apr_os_level = APR_WIN_UNK;
+APR_DECLARE_DATA apr_oslevel_e apr_os_level = APR_WIN_UNK;
 
 apr_status_t apr_get_oslevel(apr_pool_t *cont, apr_oslevel_e *level)
 {