wrowe 00/10/25 02:03:50
Modified: src/lib/apr/include apr.hw
src/lib/apr aprlib.dsp
Log:
Errr... was a goof. The HAS_UNICODE_FS shouldn't be toggled yet
across the board - will clobber 9x. Need to add run time checks.
[actually, can treat file names as utf-8 on 9x, but must not call
wide char functions!]
Revision Changes Path
1.33 +7 -1 apache-2.0/src/lib/apr/include/apr.hw
Index: apr.hw
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.hw,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- apr.hw 2000/10/25 02:46:43 1.32
+++ apr.hw 2000/10/25 09:03:45 1.33
@@ -154,7 +154,13 @@
#define APR_HAS_MMAP 0
#define APR_HAS_XLATE 0
-#define APR_HAS_UNICODE_FS 1
+/*
+ * XXX: Problem - while this may be an NT build - if we share binaries,
+ * this is actually a run time decision
+ * Until tested and validated - back to 'future' status (feel free to toggle
+ * to 1 and experiment.
+ */
+#define APR_HAS_UNICODE_FS 0
/* Typedefs that APR needs. */
1.44 +2 -2 apache-2.0/src/lib/apr/aprlib.dsp
Index: aprlib.dsp
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.dsp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- aprlib.dsp 2000/10/25 02:46:41 1.43
+++ aprlib.dsp 2000/10/25 09:03:48 1.44
@@ -43,7 +43,7 @@
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32"
/I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32"
/I "i18n/unix" /D "NDEBUG" /D "APR_UNICODE" /D "APR_IMPLEMENT_UNICODE" /D "APR_DECLARE_EXPORT"
/D "WIN32" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32"
/I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32"
/I "i18n/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /FD /c
# SUBTRACT CPP /YX
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
@@ -69,7 +69,7 @@
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
# ADD BASE CPP /nologo /MTd /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /ZI
/c
-# ADD CPP /nologo /MDd /W3 /GX /Od /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32"
/I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32"
/I "i18n/unix" /D "_DEBUG" /D "APR_UNICODE" /D "APR_IMPLEMENT_UNICODE" /D "APR_DECLARE_EXPORT"
/D "WIN32" /D "_WINDOWS" /FD /ZI /c
+# ADD CPP /nologo /MDd /W3 /GX /Od /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32"
/I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32"
/I "i18n/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /FD /ZI /c
# SUBTRACT CPP /YX
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
|