Update License Year 2023 (#39)

* Update License Year 2023 * fixed ubuntu badge * updated doctest * updated httplib
nadjieb · Oct 28, 2023 · 3698a9e · 3698a9e
1 parent 65e2129
commit 3698a9e
Show file tree

Hide file tree

Showing 10 changed files with 3,639 additions and 2,197 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2022 Muhammad Kamal Nadjieb
+Copyright (c) 2020-2023 Muhammad Kamal Nadjieb
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 ![C++ MJPEG over HTTP Library](https://raw.githubusercontent.com/nadjieb/cpp-mjpeg-streamer/master/doc/images/cpp_mjpeg_streamer.png)
 
-[![Ubuntu](https://github.com/nadjieb/cpp-mjpeg-streamer/workflows/Ubuntu/badge.svg)](https://github.com/nadjieb/cpp-mjpeg-streamer/actions?query=workflow%3AUbuntu)
+[![Ubuntu](https://github.com/nadjieb/cpp-mjpeg-streamer/workflows/ubuntu/badge.svg)](https://github.com/nadjieb/cpp-mjpeg-streamer/actions?query=workflow%3Aubuntu)
 [![macOS](https://github.com/nadjieb/cpp-mjpeg-streamer/workflows/macOS/badge.svg)](https://github.com/nadjieb/cpp-mjpeg-streamer/actions?query=workflow%3AmacOS)
 [![Windows](https://github.com/nadjieb/cpp-mjpeg-streamer/workflows/Windows/badge.svg)](https://github.com/nadjieb/cpp-mjpeg-streamer/actions?query=workflow%3AWindows)
 [![Coverage Status](https://coveralls.io/repos/github/nadjieb/cpp-mjpeg-streamer/badge.svg?branch=master)](https://coveralls.io/github/nadjieb/cpp-mjpeg-streamer?branch=master)

diff --git a/include/nadjieb/mjpeg_streamer.hpp b/include/nadjieb/mjpeg_streamer.hpp
@@ -4,7 +4,7 @@ C++ MJPEG over HTTP Library
 
 MIT License
 
-Copyright (c) 2020-2022 Muhammad Kamal Nadjieb
+Copyright (c) 2020-2023 Muhammad Kamal Nadjieb
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/include/nadjieb/net/socket.hpp b/include/nadjieb/net/socket.hpp
@@ -3,8 +3,12 @@
 #include <nadjieb/utils/platform.hpp>
 
 #ifdef NADJIEB_MJPEG_STREAMER_PLATFORM_WINDOWS
-#undef UNICODE
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif  // WIN32_LEAN_AND_MEAN
+
+#undef UNICODE
+
 #include <windows.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>

diff --git a/single_include/nadjieb/mjpeg_streamer.hpp b/single_include/nadjieb/mjpeg_streamer.hpp
@@ -4,7 +4,7 @@ C++ MJPEG over HTTP Library
 
 MIT License
 
-Copyright (c) 2020-2022 Muhammad Kamal Nadjieb
+Copyright (c) 2020-2023 Muhammad Kamal Nadjieb
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -173,8 +173,12 @@ class HTTPResponse {
 
 
 #ifdef NADJIEB_MJPEG_STREAMER_PLATFORM_WINDOWS
-#undef UNICODE
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif  // WIN32_LEAN_AND_MEAN
+
+#undef UNICODE
+
 #include <windows.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>

diff --git a/test/include/doctest/doctest.h b/test/include/doctest/doctest.h