Fix compilation for MinGW with wxUSE_IPV6==1.

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

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index ec550fcf244c9a990bec2e530683fd7418e9533a..07a73e52662533ff683f00dd5d382fbe5fecc6d8 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -69,26 +69,6 @@
 
 #endif // HAS_PIPE_STREAMS
 
 
 #endif // HAS_PIPE_STREAMS
 

-#if defined(__MWERKS__) && defined(__MACH__)
-    #ifndef WXWIN_OS_DESCRIPTION
-        #define WXWIN_OS_DESCRIPTION "MacOS X"
-    #endif
-    #ifndef HAVE_NANOSLEEP
-        #define HAVE_NANOSLEEP
-    #endif
-    #ifndef HAVE_UNAME
-        #define HAVE_UNAME
-    #endif
-
-    // our configure test believes we can use sigaction() if the function is
-    // available but Metrowekrs with MSL run-time does have the function but
-    // doesn't have sigaction struct so finally we can't use it...
-    #ifdef __MSL__
-        #undef wxUSE_ON_FATAL_EXCEPTION
-        #define wxUSE_ON_FATAL_EXCEPTION 0
-    #endif
-#endif
-

 // not only the statfs syscall is called differently depending on platform, but
 // one of its incarnations, statvfs(), takes different arguments under
 // different platforms and even different versions of the same system (Solaris
 // not only the statfs syscall is called differently depending on platform, but
 // one of its incarnations, statvfs(), takes different arguments under
 // different platforms and even different versions of the same system (Solaris


@@ -152,6 +132,10 @@
     #include <sys/sysinfo.h>   // for SAGET and MINFO structures
 #endif
 
     #include <sys/sysinfo.h>   // for SAGET and MINFO structures
 #endif
 

+#ifdef HAVE_SETPRIORITY
+    #include <sys/resource.h>   // for setpriority()
+#endif
+

 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------


@@ -565,6 +549,21 @@ long wxExecute(char **argv, int flags, wxProcess *process,
         }
     }
 
         }
     }
 

+    // priority: we need to map wxWidgets priority which is in the range 0..100
+    // to Unix nice value which is in the range -20..19. As there is an odd
+    // number of elements in our range and an even number in the Unix one, we
+    // have to do it in this rather ugly way to guarantee that:
+    //  1. wxPRIORITY_{MIN,DEFAULT,MAX} map to -20, 0 and 19 respectively.
+    //  2. The mapping is monotonously increasing.
+    //  3. The mapping is onto the target range.
+    int prio = process ? process->GetPriority() : 0;
+    if ( prio <= 50 )
+        prio = (2*prio)/5 - 20;
+    else if ( prio < 55 )
+        prio = 1;
+    else
+        prio = (2*prio)/5 - 21;
+

     // fork the process
     //
     // NB: do *not* use vfork() here, it completely breaks this code for some
     // fork the process
     //
     // NB: do *not* use vfork() here, it completely breaks this code for some


@@ -598,6 +597,13 @@ long wxExecute(char **argv, int flags, wxProcess *process,
         }
 #endif // !__VMS
 
         }
 #endif // !__VMS
 

+#if defined(HAVE_SETPRIORITY)
+        if ( prio && setpriority(PRIO_PROCESS, 0, prio) != 0 )
+        {
+            wxLogSysError(_("Failed to set process priority"));
+        }
+#endif // HAVE_SETPRIORITY
+

         // redirect stdin, stdout and stderr
         if ( pipeIn.IsOk() )
         {
         // redirect stdin, stdout and stderr
         if ( pipeIn.IsOk() )
         {


@@ -1012,7 +1018,7 @@ wxLinuxDistributionInfo wxGetLinuxDistributionInfo()
 #endif
 
 // these functions are in src/osx/utilsexc_base.cpp for wxMac
 #endif
 
 // these functions are in src/osx/utilsexc_base.cpp for wxMac

-#ifndef __WXMAC__
+#ifndef __DARWIN__

 
 wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
 {
 
 wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
 {


@@ -1048,7 +1054,7 @@ wxString wxGetOsDescription()
     return wxGetCommandOutput(wxT("uname -s -r -m"));
 }
 
     return wxGetCommandOutput(wxT("uname -s -r -m"));
 }
 

-#endif // !__WXMAC__
+#endif // !__DARWIN__

 
 unsigned long wxGetProcessId()
 {
 
 unsigned long wxGetProcessId()
 {