fix across platforms

hggq · Oct 6, 2023 · 3b656af · 3b656af
1 parent 373c193
commit 3b656af
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/vendor/httpserver/src/https_brotli.cpp b/vendor/httpserver/src/https_brotli.cpp
@@ -8,7 +8,7 @@ namespace http
     {
         std::array<unsigned char, 2048> buffer;
         auto instance = BrotliEncoderCreateInstance(nullptr, nullptr, nullptr);
-        unsigned long available_in = data.length(), available_out = buffer.size();
+        size_t  available_in = data.length(), available_out = buffer.size();
         const unsigned char *next_in = reinterpret_cast<const unsigned char *>(data.c_str());
         unsigned char *next_out = buffer.data();
 
@@ -29,7 +29,7 @@ namespace http
     {
         auto instance = BrotliEncoderCreateInstance(nullptr, nullptr, nullptr);
 
-        unsigned long available_in = data.length(), available_out = buffer_size;
+        size_t  available_in = data.length(), available_out = buffer_size;
         const unsigned char *next_in = reinterpret_cast<const unsigned char *>(data.c_str());
         unsigned char *next_out = buffer;
 
@@ -51,7 +51,7 @@ namespace http
         std::array<unsigned char, 2048> buffer;
         BrotliDecoderResult per_result;
         auto instance = BrotliDecoderCreateInstance(nullptr, nullptr, nullptr);
-        unsigned long available_in = data.length(), available_out = buffer.size();
+        size_t  available_in = data.length(), available_out = buffer.size();
         const unsigned char *next_in = reinterpret_cast<const unsigned char *>(data.c_str());
         unsigned char *next_out = buffer.data();
 
@@ -71,7 +71,7 @@ namespace http
     {
         BrotliDecoderResult per_result;
         auto instance = BrotliDecoderCreateInstance(nullptr, nullptr, nullptr);
-        unsigned long available_in = data.length(), available_out = buffer_size;
+        size_t  available_in = data.length(), available_out = buffer_size;
         const unsigned char *next_in = reinterpret_cast<const unsigned char *>(data.c_str());
         unsigned char *next_out = buffer;
         do

diff --git a/vendor/httpserver/src/server.cpp b/vendor/httpserver/src/server.cpp
@@ -2750,6 +2750,7 @@ void httpserver::httpwatch()
             clientrunpool.printthreads(false);
 #endif
 
+#if (defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__)) && !defined(__CYGWIN__)
             // save access.log
             if (!access_loglist.empty())
             {
@@ -2825,6 +2826,8 @@ void httpserver::httpwatch()
                 }
                 close(fd);
             }
+ #endif
+
             if (n_write > 0)
             {
                 n_write = 0;