1619ec812b
This is on track to replace libupnp in the next version. Since libupnp is not building with GCC10, do this now. Also backported needed header patch. Replace other patches with the upstream versions. Signed-off-by: Rosen Penev <rosenp@gmail.com>
74 lines
2.1 KiB
Diff
74 lines
2.1 KiB
Diff
From 89b289cde29c731f995642a341dc5fd3b47ec7a0 Mon Sep 17 00:00:00 2001
|
|
From: Jean-Francois Dockes <jf@dockes.org>
|
|
Date: Mon, 4 May 2020 16:32:23 +0200
|
|
Subject: [PATCH] The access() system call needs unistd.h, at least on Focal
|
|
|
|
---
|
|
src/file_request_handler.cc | 2 +-
|
|
src/iohandler/io_handler_chainer.cc | 2 +-
|
|
src/serve_request_handler.cc | 2 +-
|
|
src/util/upnp_quirks.cc | 2 +-
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/file_request_handler.cc b/src/file_request_handler.cc
|
|
index e8579b06..cfa3eaed 100644
|
|
--- a/src/file_request_handler.cc
|
|
+++ b/src/file_request_handler.cc
|
|
@@ -30,9 +30,9 @@
|
|
/// \file file_request_handler.cc
|
|
|
|
#include "file_request_handler.h" // API
|
|
-
|
|
#include <filesystem>
|
|
#include <sys/stat.h>
|
|
+#include <unistd.h>
|
|
#include <utility>
|
|
|
|
#include "config/config_manager.h"
|
|
diff --git a/src/iohandler/io_handler_chainer.cc b/src/iohandler/io_handler_chainer.cc
|
|
index e8701cd7..beaa9d03 100644
|
|
--- a/src/iohandler/io_handler_chainer.cc
|
|
+++ b/src/iohandler/io_handler_chainer.cc
|
|
@@ -30,8 +30,8 @@
|
|
/// \file io_handler_chainer.cc
|
|
|
|
#include "io_handler_chainer.h" // API
|
|
-
|
|
#include <cstdlib>
|
|
+#include <unistd.h>
|
|
|
|
#include "exceptions.h"
|
|
|
|
diff --git a/src/serve_request_handler.cc b/src/serve_request_handler.cc
|
|
index 8eaf46af..210140a3 100644
|
|
--- a/src/serve_request_handler.cc
|
|
+++ b/src/serve_request_handler.cc
|
|
@@ -30,8 +30,8 @@
|
|
/// \file serve_request_handler.cc
|
|
|
|
#include "serve_request_handler.h"
|
|
-
|
|
#include <sys/stat.h>
|
|
+#include <unistd.h>
|
|
#include <utility>
|
|
|
|
#include "config/config_manager.h"
|
|
diff --git a/src/util/upnp_quirks.cc b/src/util/upnp_quirks.cc
|
|
index df137370..e6f510b4 100644
|
|
--- a/src/util/upnp_quirks.cc
|
|
+++ b/src/util/upnp_quirks.cc
|
|
@@ -24,13 +24,13 @@
|
|
/// \file upnp_quirks.cc
|
|
|
|
#include "upnp_quirks.h" // API
|
|
-
|
|
#include "cds_objects.h"
|
|
#include "config/config_manager.h"
|
|
#include "server.h"
|
|
#include "util/tools.h"
|
|
#include "util/upnp_clients.h"
|
|
#include "util/upnp_headers.h"
|
|
+#include <unistd.h>
|
|
|
|
Quirks::Quirks(std::shared_ptr<Config> config, const struct sockaddr_storage* addr, const std::string& userAgent)
|
|
: config(std::move(config))
|