diff options
author | William A. Rowe Jr <wrowe@apache.org> | 2000-10-25 09:03:48 +0000 |
---|---|---|
committer | William A. Rowe Jr <wrowe@apache.org> | 2000-10-25 09:03:48 +0000 |
commit | 249ccd1d46f763bb2aafb9900b0ed3eb23afadc7 (patch) | |
tree | 8a04241ff5b71a13930020d57d941574e4315fa3 | |
parent | 903a8a7a306454df7cab9f1e2e9c7fdf63b1c6f0 (diff) | |
download | apr-249ccd1d46f763bb2aafb9900b0ed3eb23afadc7.tar.gz |
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!]
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@60611 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | apr.dsp | 4 | ||||
-rw-r--r-- | aprlib.dsp | 4 | ||||
-rw-r--r-- | include/apr.hw | 8 |
3 files changed, 11 insertions, 5 deletions
@@ -43,7 +43,7 @@ RSC=rc.exe # 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 @@ RSC=rc.exe # 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 diff --git a/aprlib.dsp b/aprlib.dsp index d8e115784..d51807f1e 100644 --- a/aprlib.dsp +++ b/aprlib.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # 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 @@ RSC=rc.exe # 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 diff --git a/include/apr.hw b/include/apr.hw index f107f5c88..15493af0d 100644 --- a/include/apr.hw +++ b/include/apr.hw @@ -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. */ |