You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2002/06/24 04:13:44 UTC
cvs commit: apr/include/arch/win32 fileio.h misc.h
wrowe 2002/06/23 19:13:44
Modified: misc/win32 misc.c
include/arch/win32 fileio.h misc.h
Log:
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.
Revision Changes Path
1.15 +1 -1 apr/misc/win32/misc.c
Index: misc.c
===================================================================
RCS file: /home/cvs/apr/misc/win32/misc.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- misc.c 23 Jun 2002 06:19:34 -0000 1.14
+++ misc.c 24 Jun 2002 02:13:44 -0000 1.15
@@ -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)
{
1.68 +1 -1 apr/include/arch/win32/fileio.h
Index: fileio.h
===================================================================
RCS file: /home/cvs/apr/include/arch/win32/fileio.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- fileio.h 25 Mar 2002 20:15:58 -0000 1.67
+++ fileio.h 24 Jun 2002 02:13:44 -0000 1.68
@@ -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;
1.44 +1 -1 apr/include/arch/win32/misc.h
Index: misc.h
===================================================================
RCS file: /home/cvs/apr/include/arch/win32/misc.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- misc.h 13 Apr 2002 19:27:24 -0000 1.43
+++ misc.h 24 Jun 2002 02:13:44 -0000 1.44
@@ -141,7 +141,7 @@
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 *);