You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jw...@apache.org on 2001/07/26 05:33:21 UTC
cvs commit: apr/user/win32 userinfo.c
jwoolley 01/07/25 20:33:21
Modified: file_io/win32 filestat.c
user/win32 userinfo.c
Log:
I did a recursive grep for "#ifdef APR_" and am cleaning up what I found. =-)
PS: How did that "#endif APR_HAS_UNICODE_FS" thing ever compile? Does MSVC
actually let you do that sort of thing?
Revision Changes Path
1.54 +4 -4 apr/file_io/win32/filestat.c
Index: filestat.c
===================================================================
RCS file: /home/cvs/apr/file_io/win32/filestat.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -u -r1.53 -r1.54
--- filestat.c 2001/07/12 23:26:40 1.53
+++ filestat.c 2001/07/26 03:33:17 1.54
@@ -409,7 +409,7 @@
int isroot = 0;
apr_status_t ident_rv = 0;
apr_status_t rv;
-#ifdef APR_HAS_UNICODE_FS
+#if APR_HAS_UNICODE_FS
apr_wchar_t wfname[APR_PATH_MAX];
#endif
@@ -448,7 +448,7 @@
wanted &= ~finfo->valid;
}
-#ifdef APR_HAS_UNICODE_FS
+#if APR_HAS_UNICODE_FS
if (os_level >= APR_WIN_NT) {
if (rv = utf8_to_unicode_path(wfname, sizeof(wfname)
/ sizeof(apr_wchar_t), fname))
@@ -530,7 +530,7 @@
* so go ask for the full path.
*/
if (os_level >= APR_WIN_NT) {
-#ifdef APR_HAS_UNICODE_FS
+#if APR_HAS_UNICODE_FS
apr_wchar_t tmpname[APR_FILE_MAX];
apr_wchar_t *tmpoff;
if (GetFullPathNameW(wfname, sizeof(tmpname) / sizeof(apr_wchar_t),
@@ -562,7 +562,7 @@
if (wanted &= ~finfo->valid) {
/* Caller wants more than APR_FINFO_MIN | APR_FINFO_NAME */
-#ifdef APR_HAS_UNICODE_FS
+#if APR_HAS_UNICODE_FS
if (os_level >= APR_WIN_NT)
return more_finfo(finfo, wfname, wanted, MORE_OF_WFSPEC, os_level);
#endif
1.14 +1 -1 apr/user/win32/userinfo.c
Index: userinfo.c
===================================================================
RCS file: /home/cvs/apr/user/win32/userinfo.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -u -r1.13 -r1.14
--- userinfo.c 2001/06/10 22:40:08 1.13
+++ userinfo.c 2001/07/26 03:33:21 1.14
@@ -164,7 +164,7 @@
return APR_ENOENT;
}
else
-#endif APR_HAS_UNICODE_FS
+#endif /* APR_HAS_UNICODE_FS */
{
keylen = sizeof(regkey);
rv = RegQueryValueEx(key, "ProfileImagePath", NULL, &type,
Re: cvs commit: apr/user/win32 userinfo.c
Posted by Cliff Woolley <cl...@yahoo.com>.
On Wed, 25 Jul 2001, William A. Rowe, Jr. wrote:
> > PS: How did that "#endif APR_HAS_UNICODE_FS" thing ever compile?
> > Does MSVC actually let you do that sort of thing?
>
> It seems ... yes ... they must have left one of the Dbase/Foxpro guys
> into the msvc laboritory :)
heheh Yeah, that must be it. =-)
--Cliff
--------------------------------------------------------------
Cliff Woolley
cliffwoolley@yahoo.com
Charlottesville, VA
Re: cvs commit: apr/user/win32 userinfo.c
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
From: <jw...@apache.org>
Sent: Wednesday, July 25, 2001 10:33 PM
> jwoolley 01/07/25 20:33:21
>
> Modified: file_io/win32 filestat.c
> user/win32 userinfo.c
> Log:
> I did a recursive grep for "#ifdef APR_" and am cleaning up what I found. =-)
>
> PS: How did that "#endif APR_HAS_UNICODE_FS" thing ever compile? Does MSVC
> actually let you do that sort of thing?
It seems ... yes ... they must have left one of the Dbase/Foxpro guys into the msvc
laboritory :)