Don't use unsafe strcpy() when parsing wxNativeFontInfo.

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

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 7394cc50e6babc6ed0df7b5a518ff4e1285d3826..2e9973b6da81370f3a26771f0e860aab904f1b64 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -880,9 +880,9 @@ wxLinuxDistributionInfo wxGetLinuxDistributionInfo()
     const wxString desc = wxGetCommandOutput(wxT("lsb_release --description"));
     const wxString rel = wxGetCommandOutput(wxT("lsb_release --release"));
     const wxString codename = wxGetCommandOutput(wxT("lsb_release --codename"));
-    
+
     wxLinuxDistributionInfo ret;
-    
+
     id.StartsWith("Distributor ID:\t", &ret.Id);
     desc.StartsWith("Description:\t", &ret.Description);
     rel.StartsWith("Release:\t", &ret.Release);
@@ -1412,7 +1412,7 @@ int wxAppTraits::WaitForChild(wxExecuteData& execData)
     }
     //else: synchronous execution case
 
-#if HAS_PIPE_INPUT_STREAM
+#if HAS_PIPE_INPUT_STREAM && wxUSE_SOCKETS
     wxProcess * const process = execData.process;
     if ( process && process->IsRedirected() )
     {