make --static flag act on --cppflags too.

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

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index fbf5377f76fb6e7412f15e56ac7ab1e9a0bf1cc5..ffbde3589f2f1224a7cbf9b62d25ed26e7ea1479 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -29,7 +29,7 @@
 #include "wx/stream.h"
 
 #ifdef HAVE_STATFS
 #include "wx/stream.h"
 
 #ifdef HAVE_STATFS

-#  ifdef __DARWIN__
+#  ifdef __BSD__

 #    include <sys/param.h>
 #    include <sys/mount.h>
 #  else
 #    include <sys/param.h>
 #    include <sys/mount.h>
 #  else


@@ -37,6 +37,12 @@
 #  endif
 #endif // HAVE_STATFS
 
 #  endif
 #endif // HAVE_STATFS
 

+#ifdef HAVE_STATVFS
+    #include <sys/statvfs.h>
+
+    #define statfs statvfs
+#endif // HAVE_STATVFS
+

 #if wxUSE_GUI
     #include "wx/unix/execute.h"
 #endif
 #if wxUSE_GUI
     #include "wx/unix/execute.h"
 #endif


@@ -288,32 +294,12 @@ bool wxShell(const wxString& command, wxArrayString& output)
 
 void wxHandleProcessTermination(wxEndProcessData *proc_data)
 {
 
 void wxHandleProcessTermination(wxEndProcessData *proc_data)
 {

-    int pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);
-
-    // waitpid is POSIX so should be available everywhere, however on older
-    // systems wait() might be used instead in a loop (until the right pid
-    // terminates)
-    int status = 0;
-    int rc;
-
-    // wait for child termination and if waitpid() was interrupted, try again
-    do
-    {
-       rc = waitpid(pid, &status, 0);
-    }
-    while ( rc == -1 && errno == EINTR );
-

     // notify user about termination if required
     if ( proc_data->process )
     {
     // notify user about termination if required
     if ( proc_data->process )
     {

-        proc_data->process->OnTerminate
-                            (
-                                proc_data->pid,
-                                (rc == 0) && WIFEXITED(status)
-                                    ? WEXITSTATUS(status)
-                                    : -1
-                            );
+        proc_data->process->OnTerminate(proc_data->pid, proc_data->exitcode);

     }
     }

+

     // clean up
     if ( proc_data->pid > 0 )
     {
     // clean up
     if ( proc_data->pid > 0 )
     {


@@ -321,9 +307,7 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data)
     }
     else
     {
     }
     else
     {

-       // wxExecute() will know about it
-       proc_data->exitcode = status;
-
+       // let wxExecute() know that the process has terminated

        proc_data->pid = 0;
     }
 }
        proc_data->pid = 0;
     }
 }


@@ -1029,8 +1013,7 @@ long wxGetFreeMemory()
 
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {
 
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {

-#ifdef HAVE_STATFS
-
+#if defined(HAVE_STATFS) || defined(HAVE_STATVFS)

     struct statfs fs;
     if ( statfs(path, &fs) != 0 )
     {
     struct statfs fs;
     if ( statfs(path, &fs) != 0 )
     {


@@ -1039,6 +1022,9 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
         return FALSE;
     }
 
         return FALSE;
     }
 

+    // under Solaris we might have to use fs.f_frsize instead as I think it
+    // may be a multiple of the block size in general (TODO)
+

     if ( pTotal )
     {
         *pTotal = wxLongLong(fs.f_blocks) * fs.f_bsize;
     if ( pTotal )
     {
         *pTotal = wxLongLong(fs.f_blocks) * fs.f_bsize;