Browse code

dev-tools: Remove no longer needed openvpn-plugin.h.in patching

The bug in uncrustify 0.64 is no longer causing us issues as we now
require at least v0.72.

This workaround was added as part of the initial reformat-all inclusion,
in commit 2417d55c4945d491e.

Signed-off-by: David Sommerseth <davids@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20220420121322.42732-1-openvpn@sf.lists.topphemmelig.net>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg24122.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>

David Sommerseth authored on 2022/04/20 21:13:20
Showing 3 changed files
1 1
deleted file mode 100644
... ...
@@ -1,13 +0,0 @@
1
-diff --git a/include/openvpn-plugin.h.in b/include/openvpn-plugin.h.in
2
-index 05bffab..05b4b6a 100644
3
-+++ b/include/openvpn-plugin.h.in
4
-@@ -169,7 +169,7 @@ typedef void *openvpn_plugin_handle_t;
5
- /*
6
-  * We are compiling OpenVPN.
7
-  */
8
--/* #define OPENVPN_PLUGIN_DEF        typedef */
9
-+#define OPENVPN_PLUGIN_DEF        typedef
10
- #define OPENVPN_PLUGIN_FUNC(name) (*name)
11
-
12
- #else  /* ifdef OPENVPN_PLUGIN_H */
13 1
deleted file mode 100644
... ...
@@ -1,13 +0,0 @@
1
-diff --git a/include/openvpn-plugin.h.in b/include/openvpn-plugin.h.in
2
-index 34ad18b..f4c5472 100644
3
-+++ b/include/openvpn-plugin.h.in
4
-@@ -169,7 +169,7 @@ typedef void *openvpn_plugin_handle_t;
5
- /*
6
-  * We are compiling OpenVPN.
7
-  */
8
--#define OPENVPN_PLUGIN_DEF        typedef
9
-+// #define OPENVPN_PLUGIN_DEF        typedef
10
- #define OPENVPN_PLUGIN_FUNC(name) (*name)
11
-
12
- #else
... ...
@@ -1,4 +1,3 @@
1 1
 E:doc/doxygen/doc_key_generation.h     # @verbatim section gets mistreated, exclude it
2 2
 E:src/compat/compat-lz4.c              # Preserve LZ4 upstream formatting
3 3
 E:src/compat/compat-lz4.h              # Preserve LZ4 upstream formatting
4
-P:include/openvpn-plugin.h.in          # uncrustify segfaults, patch it before+after