[Libreoffice-commits] online.git: Branch 'distro/collabora/cloudsuite-rc1' - 2 commits - loolwsd/configure.ac loolwsd/Connect.cpp loolwsd/Storage.cpp loolwsd/test

[Tor Lillqvist]

 loolwsd/Connect.cpp           |    2 ++
 loolwsd/Storage.cpp           |    2 ++
 loolwsd/configure.ac          |    2 +-
 loolwsd/test/httpposttest.cpp |    2 ++
 loolwsd/test/httpwstest.cpp   |    2 ++
 5 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 672b0ce8a9da1cfcf50acb7fcae6e4924df64357
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Apr 8 14:49:33 2016 +0300

    Include config.h to get ENABLE_SSL

diff --git a/loolwsd/Connect.cpp b/loolwsd/Connect.cpp
index b48d2ba..5233b77 100644
--- a/loolwsd/Connect.cpp
+++ b/loolwsd/Connect.cpp
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "config.h"
+
 #include <cstdlib>
 #include <cstring>
 #include <fstream>
diff --git a/loolwsd/Storage.cpp b/loolwsd/Storage.cpp
index 5e71cb4..0141d3f 100644
--- a/loolwsd/Storage.cpp
+++ b/loolwsd/Storage.cpp
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "config.h"
+
 #include <cassert>
 #include <string>
 #include <fstream>
diff --git a/loolwsd/test/httpposttest.cpp b/loolwsd/test/httpposttest.cpp
index 57548f6..36b7276 100644
--- a/loolwsd/test/httpposttest.cpp
+++ b/loolwsd/test/httpposttest.cpp
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "config.h"
+
 #include <Poco/Net/AcceptCertificateHandler.h>
 #include <Poco/Net/FilePartSource.h>
 #include <Poco/Net/HTMLForm.h>
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 1965909..a2e2612 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "config.h"
+
 #include <Poco/Net/AcceptCertificateHandler.h>
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/Net/HTTPClientSession.h>
commit e8beb9a06341916621a6bb58819e94c58490377d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Apr 8 14:35:17 2016 +0300

    It is customary to define ENABLE_FOO as 1

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index ca83f4d..b1b8630 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -124,7 +124,7 @@ AS_IF([test "$enable_tests" != "no"],
       [PKG_CHECK_MODULES([CPPUNIT], [cppunit])])
 
 AS_IF([test "$enable_ssl" != "no"],
-      [AC_DEFINE([ENABLE_SSL],[],[Enable SSL])])
+      [AC_DEFINE([ENABLE_SSL],1,[Enable SSL])])
 
 LIBS="$LIBS -lPocoNet${POCO_DEBUG_SUFFIX} -lPocoUtil${POCO_DEBUG_SUFFIX} -lPocoJSON${POCO_DEBUG_SUFFIX} -lPocoFoundation${POCO_DEBUG_SUFFIX} -lPocoXML${POCO_DEBUG_SUFFIX} -lPocoNetSSL${POCO_DEBUG_SUFFIX} -lPocoCrypto${POCO_DEBUG_SUFFIX}"