Merge ead24c458e into 5084fb104f

.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

service.h

@@ -19,7 +19,10 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define bool int
+
 int MyStartService();
 int MyStopService();
 int MyReStartService();
 int CheckServiceStatus();
+bool CheckIServiceStatus();