From: Frank Lichtenheld Date: Wed, 19 Mar 2025 14:22:24 +0000 (+0100) Subject: Post tchar.h removal cleanup X-Git-Tag: v2.7_alpha1~57 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6bb20fa8bebc29d8b3103662ffba4904d03e852d;p=thirdparty%2Fopenvpn.git Post tchar.h removal cleanup Remove some unused defines. Change-Id: Ib3a166ead912beb2a591105c84d96d342664c05f Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Message-Id: <20250319142234.25046-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg31172.html Signed-off-by: Gert Doering --- diff --git a/src/openvpnserv/service.h b/src/openvpnserv/service.h index b2b706be1..7112f26d3 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 ca5c6d4c9..49a3cf635 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]