From 9b2c68fe278b3f568934cde17f41bced29de034a Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Sat, 5 Mar 2016 17:26:40 +0500 Subject: [PATCH 1/4] 1) openssl-1.0.1r (as in openvpn-build repo) 2) moved common variables to "env" section 3) fixed implicit declaration of function 'CheckIServiceStatus' main.c:179:5: warning: implicit declaration of function 'CheckIServiceStatus' [-Wimplicit-function-declaration] CheckIServiceStatus(); ^ --- .travis.yml | 12 +++++++----- service.h | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 96708b6..bcf85ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,11 @@ os: linux language: cpp compiler: gcc +env: + global: + - OPENSSL_CRYPTO_CFLAGS="-I${HOME}/image/include" + - OPENSSL_CRYPTO_LIBS="-L${HOME}/image/lib -lcrypto" + matrix: fast_finish: true include: @@ -17,18 +22,15 @@ matrix: install: - sudo apt-get update -qq - - sudo apt-get install -qq -y gcc-mingw-w64 - - sudo apt-get install -qq -y man2html + - sudo apt-get install -qq -y gcc-mingw-w64 man2html before_script: - unset CC; unset CXX script: - mkdir image - - wget http://www.openssl.org/source/openssl-1.0.1q.tar.gz && tar zxf openssl-1.0.1q.tar.gz && cd openssl-1.0.1q + - wget http://www.openssl.org/source/openssl-1.0.1r.tar.gz && tar zxf openssl-1.0.1r.tar.gz && cd openssl-1.0.1r - ./Configure --prefix=/ --cross-compile-prefix=${CHOST}- shared $m no-multilib no-capieng --openssldir=/etc/ssl --libdir=/lib -static-libgcc - make install INSTALL_PREFIX="${HOME}/image" INSTALLTOP="/" MANDIR="/tmp" - cd .. && autoreconf -i -v - - export OPENSSL_CRYPTO_CFLAGS="-I${HOME}/image/include" - - export OPENSSL_CRYPTO_LIBS="-L${HOME}/image/lib -lcrypto" - ./configure --prefix=/ --libdir=/lib --host=$CHOST --build=x86_64-pc-linux-gnu --program-prefix='' && make diff --git a/service.h b/service.h index 5010d6a..d66cbf2 100644 --- a/service.h +++ b/service.h @@ -23,3 +23,4 @@ int MyStartService(); int MyStopService(); int MyReStartService(); int CheckServiceStatus(); +bool CheckIServiceStatus(); From 4d7019537864152c3265bc61e984df003b67f1aa Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Sat, 5 Mar 2016 17:35:31 +0500 Subject: [PATCH 2/4] =?UTF-8?q?service.h:26:1:=20error:=20unknown=20type?= =?UTF-8?q?=20name=20=E2=80=98bool=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bool CheckIServiceStatus(); ^ --- service.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/service.h b/service.h index d66cbf2..f66076b 100644 --- a/service.h +++ b/service.h @@ -19,6 +19,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include + int MyStartService(); int MyStopService(); int MyReStartService(); From 551212daadc451bf59899141226ee575f2411a83 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Sat, 5 Mar 2016 17:40:33 +0500 Subject: [PATCH 3/4] fix on defining "bool" --- service.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.h b/service.h index f66076b..5b736e9 100644 --- a/service.h +++ b/service.h @@ -19,7 +19,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include +#define bool _Bool int MyStartService(); int MyStopService(); From ead24c458e7b40808c2615f873fdfc8776ff876b Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Sat, 5 Mar 2016 17:43:09 +0500 Subject: [PATCH 4/4] more fixes --- service.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.h b/service.h index 5b736e9..8c837a7 100644 --- a/service.h +++ b/service.h @@ -19,7 +19,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define bool _Bool +#define bool int int MyStartService(); int MyStopService();