From 6039850a16e4b6216208976b0fc243c1a682f53f Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Wed, 15 Mar 2000 05:30:13 +0000 Subject: [PATCH] fix to get this to build on VMS. thanks to colin blake for this patch. r=sspitzer git-svn-id: svn://10.0.0.236/trunk@63013 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpfe/appshell/src/nsUserInfoUnix.cpp | 13 ++++++++++--- .../xpfe/components/startup/src/nsUserInfoUnix.cpp | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/mozilla/xpfe/appshell/src/nsUserInfoUnix.cpp b/mozilla/xpfe/appshell/src/nsUserInfoUnix.cpp index ce37b50ea4f..986cae84e57 100644 --- a/mozilla/xpfe/appshell/src/nsUserInfoUnix.cpp +++ b/mozilla/xpfe/appshell/src/nsUserInfoUnix.cpp @@ -32,6 +32,13 @@ #include "nsString.h" #include "nsXPIDLString.h" +/* Some UNIXy platforms don't have pw_gecos. In this case we use pw_name */ +#if defined(VMS) +#define PW_GECOS pw_name +#else +#define PW_GECOS pw_gecos +#endif + nsUserInfo::nsUserInfo() { NS_INIT_REFCNT(); @@ -52,13 +59,13 @@ nsUserInfo::GetFullname(PRUnichar **aFullname) // do I need to free pw? - if (!pw || !pw->pw_gecos) return NS_ERROR_FAILURE; + if (!pw || !pw->PW_GECOS) return NS_ERROR_FAILURE; #ifdef DEBUG_sspitzer - printf("fullname = %s\n", pw->pw_gecos); + printf("fullname = %s\n", pw->PW_GECOS); #endif - nsAutoString fullname(pw->pw_gecos); + nsAutoString fullname(pw->PW_GECOS); *aFullname = fullname.ToNewUnicode(); diff --git a/mozilla/xpfe/components/startup/src/nsUserInfoUnix.cpp b/mozilla/xpfe/components/startup/src/nsUserInfoUnix.cpp index ce37b50ea4f..986cae84e57 100644 --- a/mozilla/xpfe/components/startup/src/nsUserInfoUnix.cpp +++ b/mozilla/xpfe/components/startup/src/nsUserInfoUnix.cpp @@ -32,6 +32,13 @@ #include "nsString.h" #include "nsXPIDLString.h" +/* Some UNIXy platforms don't have pw_gecos. In this case we use pw_name */ +#if defined(VMS) +#define PW_GECOS pw_name +#else +#define PW_GECOS pw_gecos +#endif + nsUserInfo::nsUserInfo() { NS_INIT_REFCNT(); @@ -52,13 +59,13 @@ nsUserInfo::GetFullname(PRUnichar **aFullname) // do I need to free pw? - if (!pw || !pw->pw_gecos) return NS_ERROR_FAILURE; + if (!pw || !pw->PW_GECOS) return NS_ERROR_FAILURE; #ifdef DEBUG_sspitzer - printf("fullname = %s\n", pw->pw_gecos); + printf("fullname = %s\n", pw->PW_GECOS); #endif - nsAutoString fullname(pw->pw_gecos); + nsAutoString fullname(pw->PW_GECOS); *aFullname = fullname.ToNewUnicode();