From: Dr. David von Oheimb <David.von.Oheimb@siemens.com>
Date: Wed, 30 Nov 2022 20:12:20 +0000 (+0100)
Subject: check-format.pl: fix detection of '#ifdef __cplusplus'
X-Git-Tag: openssl-3.2.0-alpha1~1306
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4381c02e9b2a22f2254ca30d73e84519a40513f3;p=thirdparty%2Fopenssl.git

check-format.pl: fix detection of '#ifdef __cplusplus'

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19796)
---

diff --git a/util/check-format.pl b/util/check-format.pl
index 8303c7823ff..21ecaf0aa65 100755
--- a/util/check-format.pl
+++ b/util/check-format.pl
@@ -715,7 +715,7 @@ while (<>) { # loop over all lines of all input files
         my $space_count = length($space); # maybe could also use indentation before '#'
         report("'#if' nesting indent = $space_count != $preproc_if_nesting") if $space_count != $preproc_if_nesting;
         $preproc_if_nesting++ if $preproc_directive =~ m/^(if|ifdef|ifndef|else|elif)$/;
-        $ifdef__cplusplus = $preproc_directive eq "ifdef2" && m/\s+__cplusplus\s*$/;
+        $ifdef__cplusplus = $preproc_directive eq "ifdef" && m/\s+__cplusplus\s*$/;
 
         # handle indentation of preprocessor directive independently of surrounding normal code
         $count = -1; # do not check indentation of first line of preprocessor directive