[Libreoffice-commits] online.git: loolwsd/ChildProcessSession.hpp loolwsd/Common.hpp loolwsd/test

[Ashod Nakashian]

 loolwsd/ChildProcessSession.hpp |    3 +++
 loolwsd/Common.hpp              |    3 ---
 loolwsd/test/httpposttest.cpp   |    1 +
 loolwsd/test/httpwstest.cpp     |    1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit cf6558803157e267ea8aff34f467a902ca79db34
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Wed Jan 6 13:47:03 2016 -0500

    loolwsd: more local ClientPortNumber
    
    Change-Id: I2ce649a8f880bd0ec3bded715b1d8864e176b935
    Reviewed-on: https://gerrit.libreoffice.org/21178
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/ChildProcessSession.hpp b/loolwsd/ChildProcessSession.hpp
index 9bbb869..dd8bd20 100644
--- a/loolwsd/ChildProcessSession.hpp
+++ b/loolwsd/ChildProcessSession.hpp
@@ -16,6 +16,9 @@
 #include <Poco/NotificationQueue.h>
 #include "LOOLSession.hpp"
 
+// The client port number, which is changed via loolwsd args.
+static int ClientPortNumber = DEFAULT_CLIENT_PORT_NUMBER;
+
 class ChildProcessSession final : public LOOLSession
 {
 public:
diff --git a/loolwsd/Common.hpp b/loolwsd/Common.hpp
index 02424f6..7330f83 100644
--- a/loolwsd/Common.hpp
+++ b/loolwsd/Common.hpp
@@ -20,9 +20,6 @@ constexpr int POLL_TIMEOUT = 1000000;
 // work loads.
 constexpr int PIPE_BUFFER = 1024;
 
-// The client port number, which is changed via loolwsd args.
-static int ClientPortNumber = DEFAULT_CLIENT_PORT_NUMBER;
-
 // Flag to stop pump loops.
 static volatile bool TerminationFlag = false;
 
diff --git a/loolwsd/test/httpposttest.cpp b/loolwsd/test/httpposttest.cpp
index 772210a..d94df95 100644
--- a/loolwsd/test/httpposttest.cpp
+++ b/loolwsd/test/httpposttest.cpp
@@ -17,6 +17,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 
 #include <Common.hpp>
+#include <ChildProcessSession.hpp>
 
 /// Tests the HTTP POST API of loolwsd. The server has to be started manually before running this test.
 class HTTPPostTest : public CPPUNIT_NS::TestFixture
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index cb05b71..850d606 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -18,6 +18,7 @@
 
 #include <LOOLProtocol.hpp>
 #include <Common.hpp>
+#include <ChildProcessSession.hpp>
 
 /// Tests the HTTP WebSocket API of loolwsd. The server has to be started manually before running this test.
 class HTTPWSTest : public CPPUNIT_NS::TestFixture