Various changes to make pop up menus work

[wxWidgets.git] / src / unix / snglinst.cpp

diff --git a/src/unix/snglinst.cpp b/src/unix/snglinst.cpp
index 80bf0d1629b17ad763bd1b9880547075efb2b4d1..d29268bbd3d9b096be9458448907a9c45aa0ad91 100644 (file)
--- a/src/unix/snglinst.cpp
+++ b/src/unix/snglinst.cpp
@@ -44,7 +44,7 @@
 
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/stat.h>
+#include <sys/stat.h>           // for S_I[RW]USR
 #include <signal.h>             // for kill()
 #include <errno.h>
 
@@ -153,7 +153,7 @@ LockResult wxSingleInstanceCheckerImpl::CreateLockFile()
     // try to open the file
     m_fdLock = open(m_nameLock,
                     O_WRONLY | O_CREAT | O_EXCL,
-                    S_IREAD | S_IWRITE);
+                    S_IRUSR | S_IWUSR);
 
     if ( m_fdLock != -1 )
     {
@@ -167,7 +167,7 @@ LockResult wxSingleInstanceCheckerImpl::CreateLockFile()
 
             // use char here, not wxChar!
             char buf[256]; // enough for any PID size
-            int len = sprintf(buf, "%d", m_pidLocker) + 1;
+            int len = sprintf(buf, "%d", (int)m_pidLocker) + 1;
 
             if ( write(m_fdLock, buf, len) != len )
             {
@@ -254,7 +254,7 @@ bool wxSingleInstanceCheckerImpl::Create(const wxString& name)
     }
     else
     {
-        if ( sscanf(buf, "%d", &m_pidLocker) == 1 )
+        if ( sscanf(buf, "%d", (int *)&m_pidLocker) == 1 )
         {
             if ( kill(m_pidLocker, 0) != 0 )
             {