cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Committing in .

Browse Source 
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
This commit is contained in:
Jouk Jansen 1999-11-12 11:00:33 +00:00
parent ff52285867
commit 0fcdf6dcc5
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/unix/utilsunx.cpp
View File

@ -44,7 +44,7 @@
// JACS: needed for FD_SETSIZE // JACS: needed for FD_SETSIZE
#include <sys/time.h> #include <sys/time.h>
#if HAVE_UNAME #ifdef HAVE_UNAME
#include <sys/utsname.h> // for uname() #include <sys/utsname.h> // for uname()
#endif // HAVE_UNAME #endif // HAVE_UNAME
@ -95,14 +95,14 @@ void wxSleep(int nSecs)
void wxUsleep(unsigned long milliseconds) void wxUsleep(unsigned long milliseconds)
{ {
#if HAVE_NANOSLEEP #ifdef HAVE_NANOSLEEP
timespec tmReq; timespec tmReq;
tmReq.tv_sec = milliseconds / 1000; tmReq.tv_sec = milliseconds / 1000;
tmReq.tv_nsec = (milliseconds % 1000) * 1000 * 1000; tmReq.tv_nsec = (milliseconds % 1000) * 1000 * 1000;
// we're not interested in remaining time nor in return value // we're not interested in remaining time nor in return value
(void)nanosleep(&tmReq, (timespec *)NULL); (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 // 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() // 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 // 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 #endif // wxUSE_GUI
// fork the process // fork the process
#if HAVE_VFORK #ifdef HAVE_VFORK
pid_t pid = vfork(); pid_t pid = vfork();
#else #else
pid_t pid = fork(); pid_t pid = fork();
@ -550,10 +550,14 @@ bool wxGetUserName(wxChar *buf, int sz)
*buf = wxT('\0'); *buf = wxT('\0');
if ((who = getpwuid (getuid ())) != NULL) { if ((who = getpwuid (getuid ())) != NULL) {
#ifndef __VMS__
comma = strchr(who->pw_gecos, ','); comma = strchr(who->pw_gecos, ',');
if (comma) if (comma)
*comma = '\0'; // cut off non-name comment fields *comma = '\0'; // cut off non-name comment fields
wxStrncpy (buf, wxConvertMB2WX(who->pw_gecos), sz - 1); wxStrncpy (buf, wxConvertMB2WX(who->pw_gecos), sz - 1);
#else
wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
#endif
return TRUE; return TRUE;
} }