X-Git-Url: https://git.syn-net.org/debian/?p=anytun.git;a=blobdiff_plain;f=src%2FsysExec.h;h=666186d4d9dbdc6367cb93e4c8a6a6541db7d41d;hp=7b99638b659b1e464306e27d0f51305d5b4d8dc4;hb=65944fb7a518dc659bacaf80cf235a0352fc6a7e;hpb=ef0cacf2508418915d3f64b04003be3c13fed3cc diff --git a/src/sysExec.h b/src/sysExec.h index 7b99638..666186d 100644 --- a/src/sysExec.h +++ b/src/sysExec.h @@ -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 * * 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 . + * along with Anytun. If not, see . + * + * 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. */ #ifndef ANYTUN_sysExec_h_INCLUDED @@ -59,13 +72,13 @@ private: std::string script_; bool closed_; -#ifdef _MSC_VER - PROCESS_INFORMATION process_info_; - DWORD return_code_; -#else +#if !defined(_MSC_VER) && !defined(MINGW) pid_t pid_; int pipefd_; int return_code_; +#else + PROCESS_INFORMATION process_info_; + DWORD return_code_; #endif