Merge branch 'v1.x' into std-format

include/spdlog/common.h

@@ -51,7 +51,7 @@
 #    endif
 #endif
 
-// visual studio upto 2013 does not support noexcept nor constexpr
+// visual studio up to 2013 does not support noexcept nor constexpr
 #if defined(_MSC_VER) && (_MSC_VER < 1900)
 #    define SPDLOG_NOEXCEPT _NOEXCEPT
 #    define SPDLOG_CONSTEXPR

include/spdlog/details/mpmc_blocking_q.h

@@ -49,7 +49,7 @@ public:
         push_cv_.notify_one();
     }
 
-    // try to dequeue item. if no item found. wait upto timeout and try again
+    // try to dequeue item. if no item found. wait up to timeout and try again
     // Return true, if succeeded dequeue item, false otherwise
     bool dequeue_for(T &popped_item, std::chrono::milliseconds wait_duration)
     {
@@ -87,7 +87,7 @@ public:
         push_cv_.notify_one();
     }
 
-    // try to dequeue item. if no item found. wait upto timeout and try again
+    // try to dequeue item. if no item found. wait up to timeout and try again
     // Return true, if succeeded dequeue item, false otherwise
     bool dequeue_for(T &popped_item, std::chrono::milliseconds wait_duration)
     {

include/spdlog/details/udp_client.h

@@ -14,6 +14,7 @@
 #include <spdlog/details/os.h>
 
 #include <sys/socket.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <unistd.h>
 #include <netdb.h>

include/spdlog/fmt/bin_to_hex.h

@@ -10,7 +10,7 @@
 
 //
 // Support for logging binary data as hex
-// format flags, any combination of the followng:
+// format flags, any combination of the following:
 // {:X} - print in uppercase.
 // {:s} - don't separate each byte with space.
 // {:p} - don't print the position on each line start.

include/spdlog/sinks/daily_file_sink.h

@@ -52,7 +52,7 @@ struct daily_filename_format_calculator
         filename_t fmt_filename = fmt_lib::format(SPDLOG_FILENAME_T("{{:{}}}"), filename);
 #if defined(SPDLOG_USE_STD_FORMAT)
         return std::vformat(fmt_filename, std::make_format_args(now_tm));
-#elif defined(_MSC_VER) && defined(SPDLOG_WCHAR_FILENAMES) // for some reason msvc doesnt allow fmt::runtime(..) with wchar here
+#elif defined(_MSC_VER) && defined(SPDLOG_WCHAR_FILENAMES) // for some reason msvc doesn't allow fmt::runtime(..) with wchar here
         return fmt::format(fmt_filename, now_tm);
 #else
         return fmt::format(SPDLOG_FMT_RUNTIME(fmt_filename), now_tm);

include/spdlog/sinks/stdout_sinks-inl.h

@@ -16,7 +16,7 @@
 // so instead we use ::FileWrite
 #    include <spdlog/details/windows_include.h>
 
-#    ifndef _USING_V110_SDK71_ // fileapi.h doesnt exist in winxp
+#    ifndef _USING_V110_SDK71_ // fileapi.h doesn't exist in winxp
 #        include <fileapi.h>   // WriteFile (..)
 #    endif
 
@@ -60,7 +60,7 @@ SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::log(const details::log_msg &m
     std::lock_guard<mutex_t> lock(mutex_);
     memory_buf_t formatted;
     formatter_->format(msg, formatted);
-    ::fflush(file_); // flush in case there is somthing in this file_ already
+    ::fflush(file_); // flush in case there is something in this file_ already
     auto size = static_cast<DWORD>(formatted.size());
     DWORD bytes_written = 0;
     bool ok = ::WriteFile(handle_, formatted.data(), size, &bytes_written, nullptr) != 0;