In perl.git, the branch blead has been updated
<https://perl5.git.perl.org/perl.git/commitdiff/f9fd00352c933f36c59d5f87da1a1c4467703e83?hp=bf5c7c7dda5ab51eb76dfb8282ec8fa20cea9363>
- Log -----------------------------------------------------------------
commit f9fd00352c933f36c59d5f87da1a1c4467703e83
Author: James E Keenan <jkee...@cpan.org>
Date: Mon Dec 3 19:25:51 2018 -0500
Add header-guards to 2 additional files
Two header files in ext/SDBM_File appear to be blead-upstream, so we can
add header guards here as well.
For: RT 133699
commit 3dd7db2969bdf599c8ef565a6173f71e2961362e
Author: James E Keenan <jkee...@cpan.org>
Date: Wed Nov 28 22:50:29 2018 -0500
Provide header guards to prevent re-inclusion
Per LGTM analysis:
https://lgtm.com/projects/g/Perl/perl5/alerts/?mode=tree&ruleFocus=2163210746
and LGTM recommendation: https://lgtm.com/rules/2163210746/
For: RT 133699
-----------------------------------------------------------------------
Summary of changes:
ext/SDBM_File/pair.h | 5 +++++
ext/SDBM_File/sdbm.h | 4 ++++
feature.h | 5 +++++
invlist_inline.h | 5 +++++
regcomp.h | 6 ++++++
regen/feature.pl | 5 +++++
6 files changed, 30 insertions(+)
diff --git a/ext/SDBM_File/pair.h b/ext/SDBM_File/pair.h
index 7191556a70..1cb24fe3c3 100644
--- a/ext/SDBM_File/pair.h
+++ b/ext/SDBM_File/pair.h
@@ -1,4 +1,7 @@
/* Mini EMBED (pair.c) */
+#ifndef PERL_SDBM_FILE_PAIR_H_
+#define PERL_SDBM_FILE_PAIR_H_
+
#define chkpage sdbm__chkpage
#define delpair sdbm__delpair
#define duppair sdbm__duppair
@@ -20,3 +23,5 @@ extern void splpage(char *, char *, long);
#ifdef SEEDUPS
extern int duppair(char *, datum);
#endif
+
+#endif /* PERL_SDBM_FILE_PAIR_H_ */
diff --git a/ext/SDBM_File/sdbm.h b/ext/SDBM_File/sdbm.h
index e353569708..428303d307 100644
--- a/ext/SDBM_File/sdbm.h
+++ b/ext/SDBM_File/sdbm.h
@@ -4,6 +4,9 @@
* author: o...@nexus.yorku.ca
* status: public domain.
*/
+#ifndef PERL_SDBM_FILE_SDBM_H_
+#define PERL_SDBM_FILE_SDBM_H_
+
#define DBLKSIZ 4096
#define PBLKSIZ 1024
#define PAIRMAX 1008 /* arbitrary on PBLKSIZ-N */
@@ -199,3 +202,4 @@ Free_t Perl_mfree(Malloc_t where);
#endif /* Include guard */
+#endif /* PERL_SDBM_FILE_SDBM_H_ */
diff --git a/feature.h b/feature.h
index 52ace09f6d..3877e16efe 100644
--- a/feature.h
+++ b/feature.h
@@ -5,6 +5,9 @@
*/
+#ifndef PERL_FEATURE_H_
+#define PERL_FEATURE_H_
+
#if defined(PERL_CORE) || defined (PERL_EXT)
#define HINT_FEATURE_SHIFT 26
@@ -162,4 +165,6 @@ S_enable_feature_bundle(pTHX_ SV *ver)
}
#endif /* PERL_IN_OP_C */
+#endif /* PERL_FEATURE_H_ */
+
/* ex: set ro: */
diff --git a/invlist_inline.h b/invlist_inline.h
index 48084d3d69..cd002cef19 100644
--- a/invlist_inline.h
+++ b/invlist_inline.h
@@ -6,6 +6,9 @@
* License or the Artistic License, as specified in the README file.
*/
+#ifndef PERL_INVLIST_INLINE_H_
+#define PERL_INVLIST_INLINE_H_
+
#if defined(PERL_IN_UTF8_C) || defined(PERL_IN_REGCOMP_C) ||
defined(PERL_IN_REGEXEC_C) || defined(PERL_IN_TOKE_C)
/* An element is in an inversion list iff its index is even numbered: 0, 2, 4,
@@ -93,3 +96,5 @@ S_invlist_array(SV* const invlist)
# endif
#endif
+
+#endif /* PERL_INVLIST_INLINE_H_ */
diff --git a/regcomp.h b/regcomp.h
index 923058b32f..c76edd7649 100644
--- a/regcomp.h
+++ b/regcomp.h
@@ -7,6 +7,10 @@
* License or the Artistic License, as specified in the README file.
*
*/
+
+#ifndef PERL_REGCOMP_H_
+#define PERL_REGCOMP_H_
+
#include "regcharclass.h"
/* Convert branch sequences to more efficient trie ops? */
@@ -1118,6 +1122,8 @@ typedef enum {
WB_BOUND
} bound_type;
+#endif /* PERL_REGCOMP_H_ */
+
/*
* ex: set ts=8 sts=4 sw=4 et:
*/
diff --git a/regen/feature.pl b/regen/feature.pl
index 89d46af907..12bf5a8068 100755
--- a/regen/feature.pl
+++ b/regen/feature.pl
@@ -242,6 +242,9 @@ read_only_bottom_close_and_rename($pm);
print $h <<EOH;
+#ifndef PERL_FEATURE_H_
+#define PERL_FEATURE_H_
+
#if defined(PERL_CORE) || defined (PERL_EXT)
#define HINT_FEATURE_SHIFT $HintShift
@@ -364,6 +367,8 @@ print $h <<EOJ;
else PL_hints &= ~HINT_UNI_8_BIT;
}
#endif /* PERL_IN_OP_C */
+
+#endif /* PERL_FEATURE_H_ */
EOJ
read_only_bottom_close_and_rename($h);
--
Perl5 Master Repository
