From patchwork Wed Apr 21 03:43:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1751 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id 4Fp0I1UsgGAsawAAIUCqbw (envelope-from ) for ; Wed, 21 Apr 2021 09:44:53 -0400 Received: from proxy4.mail.ord1d.rsapps.net ([172.30.191.6]) by director11.mail.ord1d.rsapps.net with LMTP id SChJI1UsgGCzVQAAvGGmqA (envelope-from ) for ; Wed, 21 Apr 2021 09:44:53 -0400 Received: from smtp2.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy4.mail.ord1d.rsapps.net with LMTPS id 8DXaIlUsgGDRaAAAiYrejw (envelope-from ) for ; Wed, 21 Apr 2021 09:44:53 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp2.gate.ord1d.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: bf8e4238-a2a7-11eb-b446-5254004a0287-1-1 Received: from [216.105.38.7] ([216.105.38.7:48178] helo=lists.sourceforge.net) by smtp2.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id DF/09-14622-45C20806; Wed, 21 Apr 2021 09:44:52 -0400 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1lZD9D-0007Un-HQ; Wed, 21 Apr 2021 13:44:07 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZD9B-0007UT-IQ for openvpn-devel@lists.sourceforge.net; Wed, 21 Apr 2021 13:44:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=d30VE6uuF+Hd7Huzg81z/lKas4cpBlMzDGg1lrrdfnE=; b=nVIzZR9dthkI/gdBRkiUZxaIl7 xibHiM5tPjXxGHZ0tTzAIUVBJuM5/Qm4+nJT3vvUgN7/O6jRRij8TbOvJet+mvjO3PVwrIYCFMmOH nO6DGag5HauCCjUqUdfw5Dsdy16mK3dcxTU5udjqcwBFli6p6Xyx8nnzPt/OOE7SNHW0=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=d30VE6uuF+Hd7Huzg81z/lKas4cpBlMzDGg1lrrdfnE=; b=RAYV65jvOL8q5bsIIJVy0ADrb9 6U+Dkxt2DAWq8c6dQN3C+k4Enu/xOlV7/7tEdHawl5apRKiWIFUU47mG8S/lgnxyi2BElU/nnI/37 yZK5P9mbERxZEgOODe3TK1AVlJK/+5sd1ohmx4/1hwKL3g8QRfYmo6K07vPXtiTsH+es=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1lZD95-0088oT-Cv for openvpn-devel@lists.sourceforge.net; Wed, 21 Apr 2021 13:44:06 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.94 (FreeBSD)) (envelope-from ) id 1lZD8t-0004QL-Vt for openvpn-devel@lists.sourceforge.net; Wed, 21 Apr 2021 15:43:47 +0200 Received: (nullmailer pid 1950445 invoked by uid 10006); Wed, 21 Apr 2021 13:43:48 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Wed, 21 Apr 2021 15:43:43 +0200 Message-Id: <20210421134348.1950392-2-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210421134348.1950392-1-arne@rfc2549.org> References: <20210421134348.1950392-1-arne@rfc2549.org> MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: configure.ac] 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Headers-End: 1lZD95-0088oT-Cv Subject: [Openvpn-devel] [PATCH 2/7] Move direct.h header where it is used X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox The direct.h header provides only a handful of functions [1] of which we only use _wchdir. Directly included the direct.h file where it is used and remove autoconf magic around it. [1] https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2012/as5kw0ze(v=vs.110)?redirectedfrom=MSDN Signed-off-by: Arne Schwabe --- configure.ac | 2 +- src/openvpn/platform.c | 4 ++++ src/openvpn/syshead.h | 4 ---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index aaac65c3d..a67bf2595 100644 --- a/configure.ac +++ b/configure.ac @@ -407,7 +407,7 @@ AX_TYPE_SOCKLEN_T AC_CHECK_SIZEOF([unsigned int]) AC_CHECK_SIZEOF([unsigned long]) AC_CHECK_HEADERS([ \ - fcntl.h io.h direct.h \ + fcntl.h io.h \ sys/types.h sys/socket.h \ unistd.h dlfcn.h \ netinet/in.h netinet/in_systm.h \ diff --git a/src/openvpn/platform.c b/src/openvpn/platform.c index 45ee54541..c63c1d994 100644 --- a/src/openvpn/platform.c +++ b/src/openvpn/platform.c @@ -39,6 +39,10 @@ #include "platform.h" +#if _WIN32 +#include +#endif + /* Redefine the top level directory of the filesystem * to restrict access to files for security */ void diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h index 0b029c648..cb9bf7dc7 100644 --- a/src/openvpn/syshead.h +++ b/src/openvpn/syshead.h @@ -100,10 +100,6 @@ #include #endif -#ifdef HAVE_DIRECT_H -#include -#endif - #ifdef HAVE_IO_H #include #endif