From patchwork Wed Mar 19 14:22:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4187 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7001:aca:b0:60a:d70a:d3c7 with SMTP id xf10csp343343mab; Wed, 19 Mar 2025 08:26:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXzW3yrsAnbMO2vzKqhrR0IDAPYrhkWPfG1c/Xf2edG1Q0r/vJQc0siFOZ/1SZUun5n7jDJAGuwdW0=@openvpn.net X-Google-Smtp-Source: AGHT+IEUyloTdZEJtJhQgQJFfDnRHvsvpB/kuC2hKelnoy8ra6ijNYXRM3DRHLfpfmP7CqpbnJJX X-Received: by 2002:a05:6871:5823:b0:2c2:dfbb:2dbd with SMTP id 586e51a60fabf-2c7454cbf79mr2265848fac.8.1742397967078; Wed, 19 Mar 2025 08:26:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742397967; cv=none; d=google.com; s=arc-20240605; b=WJBRyTyAxFAjjqvlfvl1pyyLxeQw2lHKCOksmmOE8MXrnoP0gMg+QUtAqT4now0aw+ UuGhrVzlm8ir2FewG8YcJSn3JQ9Dgl5URw29FGuiKHAU389SrO26LMfbwE6/aW1Wt3b5 wDp4p67DwXm2ETOu31WEQzD33msWDs/mJlUoc8JCaMgN4LbGxHcEIwcwsey0hjIRt+SR dzQbPdlBeW0IsQiRyZ1Eiv4FI7Yaoeta9IS0b6RstjuLJ4xKKa4sTgVpCAJISI61rwG5 0BaObGYcAWVGB3Kbmx5nKmc3mtt+/Hlqc4VsiT8KT5m5WPiXgTtvVWRElgV4kXAjcpcd 9FSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature; bh=yJsD/NBBM+rnqFkkSdci5P+YSMOzwweMM+t/yZYFlxM=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=PRInyJJtl5tTWW5g6EYbUrst/L9dgPD8FnligQmKYUBVsvMuBKCvqrCBfNpyEDnP+v AJndd68ukdqNfbLzOPyub9QGRiAE59kDBrNwm5E2SnPTNPAJ+96cJMwuHx1phc8l038M mQqy03Bn8/7RTysWUcFVTp+8rRH0s0BTKriV583oe/R30FseOK6tX2hgb1RzYcier+6l 1iUIRJv9ZwuqL6+HjdYyM8wEz07paVdVzGULob/8BPEVsu319z98b9U8ma9R5ICxRQ2r /xImyLGzjDsSf4jPEIEvxo5J8OpuVAJiWAF3bK3vIoVizeAkY57ykxk9314C2gbXkxZh 4Z0g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=HFokYvFx; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=jcdz5+X3; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 586e51a60fabf-2c670fb4fecsi9093583fac.13.2025.03.19.08.26.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Mar 2025 08:26:06 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=HFokYvFx; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=jcdz5+X3; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1tuvIy-0002c3-N4; Wed, 19 Mar 2025 15:26:04 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1tuvIm-0002ba-Gi for openvpn-devel@lists.sourceforge.net; Wed, 19 Mar 2025 15:25:51 +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=COR3vKK3mvG2R+vH8pvaPxTe+AfE0slHv15VKu7swrA=; b=HFokYvFxIjMihCplAWdheAgO+I Yx+/WiSODDEdrZtYlMxsikc2DBgPuyq6xl9efNEAgkTPea9o8erpM7G0YMBdJPttdr8brQYTg3jyp Od5dwkkQYaCCwTd4oDy2abBdRqGsZxCpCzYSDmU5SJ0yiml34vaBEMRrCGT/psh2BPCI=; 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=COR3vKK3mvG2R+vH8pvaPxTe+AfE0slHv15VKu7swrA=; b=jcdz5+X3mq86PmUg7echCQ+BrM ChAIZyw57FSBzEaSoV9O04cJEOm1ElR1kp0UfvBo/T0LAvtc/Qymy8PgOtqE3OW8csNJG4pJePyhL fsXWZQ3/oNtND+0jV4rkT0IoXn2gsFffNnOqTTRyvYopuWkaQN0sP29AZ4dt6mheNGNg=; Received: from dhcp-174.greenie.muc.de ([193.149.48.174] helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1tuvIZ-0007ae-AV for openvpn-devel@lists.sourceforge.net; Wed, 19 Mar 2025 15:25:46 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.17.1.9/8.17.1.9) with ESMTP id 52JEMYNZ025135 for ; Wed, 19 Mar 2025 15:22:34 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 52JEMYnx025134 for openvpn-devel@lists.sourceforge.net; Wed, 19 Mar 2025 15:22:34 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Wed, 19 Mar 2025 15:22:24 +0100 Message-ID: <20250319142234.25046-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-2.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Frank Lichtenheld Remove some unused defines. Change-Id: Ib3a166ead912beb2a591105c84d96d342664c05f Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering --- Content analysis details: (0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [193.149.48.174 listed in bl.score.senderscore.com] 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [193.149.48.174 listed in sa-accredit.habeas.com] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Headers-End: 1tuvIZ-0007ae-AV Subject: [Openvpn-devel] [PATCH v4] Post tchar.h removal cleanup 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 X-GMAIL-THRID: =?utf-8?q?1826955211626617367?= X-GMAIL-MSGID: =?utf-8?q?1827036690891501402?= From: Frank Lichtenheld Remove some unused defines. Change-Id: Ib3a166ead912beb2a591105c84d96d342664c05f Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/854 This mail reflects revision 4 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/src/openvpnserv/service.h b/src/openvpnserv/service.h index b2b706b..7112f26 100644 --- a/src/openvpnserv/service.h +++ b/src/openvpnserv/service.h @@ -24,11 +24,6 @@ #ifndef _SERVICE_H #define _SERVICE_H -/* We do not support non-unicode builds */ -#ifndef UNICODE -#define UNICODE -#endif - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/tapctl/basic.h b/src/tapctl/basic.h index ca5c6d4..49a3cf6 100644 --- a/src/tapctl/basic.h +++ b/src/tapctl/basic.h @@ -22,13 +22,11 @@ #ifndef BASIC_H #define BASIC_H -#ifdef _UNICODE -#define PRIsLPWSTR "ls" -#define PRIsLPOLESTR "ls" -#else -#define PRIsLPWSTR "s" -#define PRIsLPOLESTR "ls" +/* We do not support non-unicode builds */ +#ifndef UNICODE +#define UNICODE #endif + #define PRIXGUID "{%08lX-%04hX-%04hX-%02hhX%02hhX-%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX}" #define PRIGUID_PARAM(g) \ (g).Data1, (g).Data2, (g).Data3, (g).Data4[0], (g).Data4[1], (g).Data4[2], (g).Data4[3], (g).Data4[4], (g).Data4[5], (g).Data4[6], (g).Data4[7]