Skip to content

Commit 959eb90

Browse files
committed
reduced code changes
1 parent 29b02dd commit 959eb90

File tree

1 file changed

+17
-3
lines changed

1 file changed

+17
-3
lines changed

single_include/nadjieb/mjpeg_streamer.hpp

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ SOFTWARE.
2929

3030
// #include <nadjieb/utils/version.hpp>
3131

32+
3233
/// The major version number
3334
#define NADJIEB_MJPEG_STREAMER_VERSION_MAJOR 3
3435

@@ -39,15 +40,15 @@ SOFTWARE.
3940
#define NADJIEB_MJPEG_STREAMER_VERSION_PATCH 0
4041

4142
/// The complete version number
42-
#define NADJIEB_MJPEG_STREAMER_VERSION_CODE \
43-
(NADJIEB_MJPEG_STREAMER_VERSION_MAJOR * 10000 + NADJIEB_MJPEG_STREAMER_VERSION_MINOR * 100 \
44-
+ NADJIEB_MJPEG_STREAMER_VERSION_PATCH)
43+
#define NADJIEB_MJPEG_STREAMER_VERSION_CODE (NADJIEB_MJPEG_STREAMER_VERSION_MAJOR * 10000 + NADJIEB_MJPEG_STREAMER_VERSION_MINOR * 100 + NADJIEB_MJPEG_STREAMER_VERSION_PATCH)
4544

4645
/// Version number as string
4746
#define NADJIEB_MJPEG_STREAMER_VERSION_STRING "3.0.0"
4847

48+
4949
// #include <nadjieb/net/http_request.hpp>
5050

51+
5152
#include <sstream>
5253
#include <string>
5354
#include <unordered_map>
@@ -111,6 +112,7 @@ class HTTPRequest {
111112

112113
// #include <nadjieb/net/http_response.hpp>
113114

115+
114116
#include <sstream>
115117
#include <string>
116118
#include <unordered_map>
@@ -154,10 +156,13 @@ class HTTPResponse {
154156

155157
// #include <nadjieb/net/listener.hpp>
156158

159+
157160
// #include <nadjieb/net/socket.hpp>
158161

162+
159163
// #include <nadjieb/utils/platform.hpp>
160164

165+
161166
#if defined _MSC_VER || defined __MINGW32__
162167
#define NADJIEB_MJPEG_STREAMER_PLATFORM_WINDOWS
163168
#elif defined __APPLE_CC__ || defined __APPLE__
@@ -166,6 +171,7 @@ class HTTPResponse {
166171
#define NADJIEB_MJPEG_STREAMER_PLATFORM_LINUX
167172
#endif
168173

174+
169175
#ifdef NADJIEB_MJPEG_STREAMER_PLATFORM_WINDOWS
170176
#ifndef WIN32_LEAN_AND_MEAN
171177
#define WIN32_LEAN_AND_MEAN
@@ -333,6 +339,7 @@ static int pollSockets(NADJIEB_MJPEG_STREAMER_POLLFD* fds, size_t nfds, long tim
333339

334340
// #include <nadjieb/utils/non_copyable.hpp>
335341

342+
336343
namespace nadjieb {
337344
namespace utils {
338345
class NonCopyable {
@@ -351,6 +358,7 @@ class NonCopyable {
351358

352359
// #include <nadjieb/utils/runnable.hpp>
353360

361+
354362
namespace nadjieb {
355363
namespace utils {
356364
enum class State { UNSPECIFIED = 0, NEW, BOOTING, RUNNING, TERMINATING, TERMINATED };
@@ -366,6 +374,7 @@ class Runnable {
366374
} // namespace utils
367375
} // namespace nadjieb
368376

377+
369378
#include <functional>
370379
#include <iostream>
371380
#include <stdexcept>
@@ -559,12 +568,15 @@ class Listener : public nadjieb::utils::NonCopyable, public nadjieb::utils::Runn
559568

560569
// #include <nadjieb/net/publisher.hpp>
561570

571+
562572
// #include <nadjieb/net/socket.hpp>
563573

564574
// #include <nadjieb/net/topic.hpp>
565575

576+
566577
// #include <nadjieb/net/socket.hpp>
567578

579+
568580
#include <mutex>
569581
#include <shared_mutex>
570582
#include <string>
@@ -648,6 +660,7 @@ class Topic {
648660

649661
// #include <nadjieb/utils/runnable.hpp>
650662

663+
651664
#include <algorithm>
652665
#include <condition_variable>
653666
#include <mutex>
@@ -805,6 +818,7 @@ class Publisher : public nadjieb::utils::NonCopyable, public nadjieb::utils::Run
805818

806819
// #include <nadjieb/utils/non_copyable.hpp>
807820

821+
808822
#include <string>
809823

810824
namespace nadjieb {

0 commit comments

Comments
 (0)