disallow creation of wxDC objects and made wxDC an ABC; use wxDCTemp instead of wxDC...

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

diff --git a/src/unix/snglinst.cpp b/src/unix/snglinst.cpp
index f3c5b3e6819321845e8cf0cafd58f79ac29d4ebc..bdd773a19e470197655edd8c049304d09864463b 100644 (file)
--- a/src/unix/snglinst.cpp
+++ b/src/unix/snglinst.cpp
@@ -18,10 +18,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "snglinst.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -89,9 +85,9 @@ static int wxLockFile(int fd, LockOperation lock)
     fl.l_type = lock == LOCK ? F_WRLCK : F_UNLCK;
 
     // lock the entire file
-    fl.l_whence =
     fl.l_start =
-    fl.l_len = 0;
+    fl.l_len =
+    fl.l_whence = 0;
 
     // is this needed?
     fl.l_pid = getpid();
@@ -240,18 +236,18 @@ bool wxSingleInstanceCheckerImpl::Create(const wxString& name)
     // Check if the file is owned by current user and has 0600 permissions.
     // If it doesn't, it's a fake file, possibly meant as a DoS attack, and
     // so we refuse to touch it:
-    wxStructStat stat;
-    if ( wxStat(name, &stat) != 0 )
+    wxStructStat stats;
+    if ( wxStat(name, &stats) != 0 )
     {
         wxLogSysError(_("Failed to inspect the lock file '%s'"), name.c_str());
         return false;
     }
-    if ( stat.st_uid != getuid() )
+    if ( stats.st_uid != getuid() )
     {
         wxLogError(_("Lock file '%s' has incorrect owner."), name.c_str());
         return false;
     }
-    if ( stat.st_mode != (S_IFREG | S_IRUSR | S_IWUSR) )
+    if ( stats.st_mode != (S_IFREG | S_IRUSR | S_IWUSR) )
     {
         wxLogError(_("Lock file '%s' has incorrect permissions."), name.c_str());
         return false;
@@ -277,7 +273,7 @@ bool wxSingleInstanceCheckerImpl::Create(const wxString& name)
     }
 
     char buf[256];
-    off_t count = file.Read(buf, WXSIZEOF(buf));
+    ssize_t count = file.Read(buf, WXSIZEOF(buf));
     if ( count == wxInvalidOffset )
     {
         wxLogError(_("Failed to read PID from lock file."));