From 0fcdf6dcc5cddb2bed3fda05b29fdf3d250ef045 Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Fri, 12 Nov 1999 11:00:33 +0000 Subject: [PATCH] Committing in . VMS patch Modified Files: wxWindows/src/unix/utilsunx.cpp git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/unix/utilsunx.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index 018bf84ca2..e721318d5b 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -44,7 +44,7 @@ // JACS: needed for FD_SETSIZE #include -#if HAVE_UNAME +#ifdef HAVE_UNAME #include // for uname() #endif // HAVE_UNAME @@ -95,14 +95,14 @@ void wxSleep(int nSecs) void wxUsleep(unsigned long milliseconds) { -#if HAVE_NANOSLEEP +#ifdef HAVE_NANOSLEEP timespec tmReq; tmReq.tv_sec = milliseconds / 1000; tmReq.tv_nsec = (milliseconds % 1000) * 1000 * 1000; // we're not interested in remaining time nor in return value (void)nanosleep(&tmReq, (timespec *)NULL); -#elif HAVE_USLEEP +#elif defined( HAVE_USLEEP ) // uncomment this if you feel brave or if you are sure that your version // of Solaris has a safe usleep() function but please notice that usleep() // is known to lead to crashes in MT programs in Solaris 2.[67] and is not @@ -286,7 +286,7 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process ) #endif // wxUSE_GUI // fork the process -#if HAVE_VFORK +#ifdef HAVE_VFORK pid_t pid = vfork(); #else pid_t pid = fork(); @@ -550,10 +550,14 @@ bool wxGetUserName(wxChar *buf, int sz) *buf = wxT('\0'); if ((who = getpwuid (getuid ())) != NULL) { +#ifndef __VMS__ comma = strchr(who->pw_gecos, ','); if (comma) *comma = '\0'; // cut off non-name comment fields wxStrncpy (buf, wxConvertMB2WX(who->pw_gecos), sz - 1); +#else + wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1); +#endif return TRUE; }