Commit 7db4b65f16 for perl
commit 7db4b65f1640b22a0c280ac2272f384b54c0eb84
Author: Karl Williamson <khw@cpan.org>
Date: Mon Nov 16 10:25:04 2026 -0700
Rename util.h to perl_util.h
Fixes #18947
I looked at metacpan. There are more than 500 #include lines with util.h.
There are 91 distros that contain a util.h file. The few #include lines
I looked at were not using ours.
It was suggested in the ticket that we rename a bunch of hdrs. This
name is used an order of magnitude more than the next one. My thought
is to try this one, and see what fallout arises before trying others.
Fixing this one does more than the rest combined.
It also was suggested that the name should be util_perl.h. Normally,
I'm in favor of suffixes, so as to put the important things first. But
in this case, I think the perl is the most important thing. It is the
perl util.h file, not the util.h file that happens to come from perl
diff --git a/Cross/Makefile-cross-SH b/Cross/Makefile-cross-SH
index f2e3fd6ff4..75d7e386f8 100644
--- a/Cross/Makefile-cross-SH
+++ b/Cross/Makefile-cross-SH
@@ -335,7 +335,7 @@ unidatadirs = lib/unicore/To lib/unicore/lib
h1 = EXTERN.h INTERN.h XSUB.h av.h xconfig.h cop.h cv.h dosish.h
h2 = embed.h form.h gv.h handy.h hv.h hv_func.h keywords.h mg.h op.h opcode.h
h3 = pad.h patchlevel.h perl.h perlapi.h perly.h pp.h proto.h regcomp.h
-h4 = regexp.h scope.h sv.h unixish.h util.h iperlsys.h thread.h
+h4 = regexp.h scope.h sv.h unixish.h perl_util.h iperlsys.h thread.h
h5 = utf8.h warnings.h
h = $(h1) $(h2) $(h3) $(h4) $(h5)
diff --git a/MANIFEST b/MANIFEST
index 46d9fda707..cc3d9e65f4 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -112,6 +112,7 @@ perl_inc_macro.h macro used to set \@INC using S_incpush_use_sep
perl_langinfo.h Perl's version of <langinfo.h>
perl_lock_definitions.h Macros to invoke mutexes, generated by regen/lock_definitions.pl
perl_siphash.h Implementation of SipHash
+perl_util.h Dummy header
perlapi.h Empty backwards-compat include
perldtrace.d D script for Perl probes
perlio.c C code for PerlIO abstraction
@@ -209,7 +210,6 @@ utf8.c Unicode routines
utf8.h Unicode header
utfebcdic.h Unicode on EBCDIC (UTF-EBCDIC, tr16) header
util.c Utility routines
-util.h Dummy header
utils.lst Lists utilities bundled with Perl
vutil.c Version object C functions
vutil.h Version object headers
diff --git a/Makefile.SH b/Makefile.SH
index cd9abf6e69..3ad6f350b3 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -538,9 +538,10 @@ h = \
EXTERN.h INTERN.h XSUB.h \
av.h cop.h cv.h dosish.h embed.h form.h gv.h handy.h hv.h hv_func.h \
iperlsys.h keywords.h l1_char_class_tab.h mg.h mydtrace.h op.h \
- op_reg_common.h opcode.h pad.h patchlevel.h perl.h perlapi.h perly.h pp.h \
+ op_reg_common.h opcode.h pad.h patchlevel.h perl.h perlapi.h perl_util.h \
+ perly.h pp.h \
proto.h regcomp.h regcomp_internal.h regexp.h regexp_constants.h scope.h \
- sv.h thread.h unixish.h utf8.h util.h warnings.h \
+ sv.h thread.h unixish.h utf8.h warnings.h \
$(CONFIGH)
c_base = \
diff --git a/README.cygwin b/README.cygwin
index 79dc74ab6f..d8ca3a2b92 100644
--- a/README.cygwin
+++ b/README.cygwin
@@ -593,7 +593,7 @@ be kept as clean as possible.
pp_sys.c - do not define h_errno, init
_pwent_struct.pw_comment
util.c - use setenv
- util.h - PERL_FILE_IS_ABSOLUTE macro
+ perl_util.h - PERL_FILE_IS_ABSOLUTE macro
pp.c - Comment about Posix vs IEEE math under
Cygwin
perlio.c - CR/LF mode
diff --git a/configpm b/configpm
index 2a600a346c..e09fda03c4 100755
--- a/configpm
+++ b/configpm
@@ -80,9 +80,9 @@ my @header_files = qw(EXTERN.h INTERN.h XSUB.h av.h config.h cop.h cv.h
embed.h embedvar.h form.h gv.h handy.h hv.h hv_func.h intrpvar.h
iperlsys.h keywords.h mg.h nostdio.h op.h opcode.h
pad.h parser.h patchlevel.h perl.h perlio.h perlsdio.h
- perlvars.h perly.h pp.h pp_proto.h proto.h
+ perl_util.h perlvars.h perly.h pp.h pp_proto.h proto.h
regcomp.h regexp.h regnodes.h scope.h sv.h thread.h utf8.h
- util.h);
+ );
push @header_files,
$^O eq 'VMS' ? 'vmsish.h' : qw(dosish.h perliol.h time64.h unixish.h);
diff --git a/inline.h b/inline.h
index dfa9ac4f1c..98afa75639 100644
--- a/inline.h
+++ b/inline.h
@@ -4682,7 +4682,7 @@ Perl_newPADxVOP(pTHX_ I32 type, I32 flags, PADOFFSET padix)
return o;
}
-/* ------------------ util.h ------------------------------------------- */
+/* ------------------ perl_util.h -------------------------------------- */
/*
=for apidoc_section $string
diff --git a/perl.h b/perl.h
index 4e072898ff..5f4f9a3c72 100644
--- a/perl.h
+++ b/perl.h
@@ -4862,7 +4862,7 @@ struct Perl_OpDumpContext;
#endif
#include "sv.h"
-#include "util.h"
+#include "perl_util.h"
#include "form.h"
#include "gv.h"
#include "pad.h"
diff --git a/util.h b/perl_util.h
similarity index 99%
rename from util.h
rename to perl_util.h
index a9142127aa..eeb21fe3df 100644
--- a/util.h
+++ b/perl_util.h
@@ -1,4 +1,4 @@
-/* util.h
+/* perl_util.h
*
* Copyright (C) 1991, 1992, 1993, 1999, 2001, 2002, 2003, 2004, 2005,
* 2007, by Larry Wall and others
@@ -222,7 +222,7 @@ means arg not present, 1 is empty string/null byte */
#define HS_GETXSVERLEN(key) ((U8) ((key) >> 8))
#define HS_GETAPIVERLEN(key) ((key) & HSm_APIVERLEN)
-/* internal to util.h macro to create a packed handshake key, all args must be constants */
+/* internal to perl_util.h macro to create a packed handshake key, all args must be constants */
/* U32 return = (U16 interpsize, bool cxt, bool setxsubfn, bool popmark,
U5 (FIVE!) apiverlen, U8 xsverlen) */
#define HS_KEYp(interpsize, cxt, setxsubfn, popmark, apiverlen, xsverlen) \
diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template
index 7b14ecc234..61b00cbc4b 100644
--- a/vms/descrip_mms.template
+++ b/vms/descrip_mms.template
@@ -227,7 +227,7 @@ h2 = iperlsys.h keywords.h mydtrace.h mg.h mg_vtable.h nostdio.h op.h
h3 = op_reg_common.h opcode.h opnames.h overload.h pad.h parser.h patchlevel.h
h4 = perl.h perlapi.h perlio.h perlsdio.h perlvars.h perly.h
h5 = pp.h pp_proto.h proto.h regcomp.h regcomp_internal.h regexp.h regnodes.h scope.h
-h6 = sv.h thread.h utf8.h util.h vmsish.h warnings.h xsub.h
+h6 = sv.h thread.h utf8.h perl_util.h vmsish.h warnings.h xsub.h
h = $(h0) $(h1) $(h2) $(h3) $(h4) $(h5) $(h6)
acopt = $(ARCHCORE)perlshr_attr.opt $(ARCHCORE)$(DBG)perlshr_bld.opt
diff --git a/win32/GNUmakefile b/win32/GNUmakefile
index fded490844..1626a6126d 100644
--- a/win32/GNUmakefile
+++ b/win32/GNUmakefile
@@ -1025,7 +1025,7 @@ CORE_NOCFG_H = \
..\thread.h \
..\unixish.h \
..\utf8.h \
- ..\util.h \
+ ..\perl_util.h \
..\warnings.h \
..\XSUB.h \
..\EXTERN.h \
diff --git a/win32/Makefile b/win32/Makefile
index b90542ddf0..34c58e82d9 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -754,7 +754,7 @@ CORE_NOCFG_H = \
..\thread.h \
..\unixish.h \
..\utf8.h \
- ..\util.h \
+ ..\perl_util.h \
..\warnings.h \
..\XSUB.h \
..\EXTERN.h \