X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FsysExec.cpp;h=62c2d22bc9fb3df81dd8aba802282d37e9543ac7;hb=74b165bb1a2b001b52ee01eb56ee3ea59a81d10f;hp=a69349f53bc34de2fc196ea9e47aa24c590af816;hpb=ece844834d2cecc028ce81ca283f5d441088580e;p=anytun.git

diff --git a/src/sysExec.cpp b/src/sysExec.cpp
index a69349f..62c2d22 100644
--- a/src/sysExec.cpp
+++ b/src/sysExec.cpp
@@ -6,12 +6,12 @@
  *  tunnel endpoints.  It has less protocol overhead than IPSec in Tunnel
  *  mode and allows tunneling of every ETHER TYPE protocol (e.g.
  *  ethernet, ip, arp ...). satp directly includes cryptography and
- *  message authentication based on the methodes used by SRTP.  It is
+ *  message authentication based on the methods used by SRTP.  It is
  *  intended to deliver a generic, scaleable and secure solution for
  *  tunneling and relaying of packets of any protocol.
  *
  *
- *  Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2014 Markus Grüneis, Othmar Gsenger, Erwin Nindl,
  *                          Christian Pointner <satp@wirdorange.org>
  *
  *  This file is part of Anytun.
@@ -27,7 +27,20 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with anytun.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with Anytun.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  In addition, as a special exception, the copyright holders give
+ *  permission to link the code of portions of this program with the
+ *  OpenSSL library under certain conditions as described in each
+ *  individual source file, and distribute linked combinations
+ *  including the two.
+ *  You must obey the GNU General Public License in all respects
+ *  for all of the code used other than OpenSSL.  If you modify
+ *  file(s) with this exception, you may extend this exception to your
+ *  version of the file(s), but you are not obligated to do so.  If you
+ *  do not wish to do so, delete this exception statement from your
+ *  version.  If you delete this exception statement from all source
+ *  files in the program, then also delete it here.
  */
 
 #include <boost/bind.hpp>
@@ -39,7 +52,7 @@
 #include "anytunError.h"
 
 //use system specific sys exec
-#ifndef _MSC_VER
+#if !defined(_MSC_VER) && !defined(MINGW)
 #include "sysExec.hpp"
 #else
 #include "win32/sysExec.hpp"
@@ -66,7 +79,7 @@ SysExec::SysExec(std::string const& script, StringVector args, StringList env) :
   doExec(args, env);
 }
 
-int SysExec::getReturnCode() const 
+int SysExec::getReturnCode() const
 {
   return return_code_;
 }