Re: current git Fails to compile on Solaris 11 x86

[Peter Stephenson <p.w.stephenson@ntlworld.com>]

> On 20/03/2024 09:30 GMT Peter Stephenson <p.w.stephenson@ntlworld.com> wrote:
> > On 20/03/2024 04:41 GMT Clinton Bunch <cdb_zsh@zentaur.org> wrote:
> > ./configure --prefix=$HOME/local
> > Solaris 11/Developer Studio 12 
> > Src/Modules/hlgroup.c
> > 
> > 
> > cc -c -I. -I../../Src -I../../Src -I../../Src/Zle -I. -DHAVE_CONFIG_H 
> > -DMODULE -O -KPIC -o hlgroup..o hlgroup.c
> > "hlgroup.c", line 144: void function cannot return value
> > "hlgroup.c", line 158: void function cannot return value
> > cc: acomp failed for hlgroup.c
> 
> Is the function name getpmsgr perhaps already used by Solaris?

The Interweb thing isn't particularly forthcoming on the subject, but I
can see a STREAMS function getpmsg() - Receive next message from a
STREAMS file.  I wonder if this is a re-entrant version of that.

Let's just rename it and the others in that area.

pws

diff --git a/Src/Modules/hlgroup.c b/Src/Modules/hlgroup.c
index 6382f32..60f0254 100644
--- a/Src/Modules/hlgroup.c
+++ b/Src/Modules/hlgroup.c
@@ -128,35 +128,35 @@ scangroup(ScanFunc func, int flags, int sgr)
 }
 /**/
 static HashNode
-getpmesc(UNUSED(HashTable ht), const char *name)
+getpmzleesc(UNUSED(HashTable ht), const char *name)
 {
     return getgroup(name, 0);
 }
 
 /**/
 static void
-scanpmesc(UNUSED(HashTable ht), ScanFunc func, int flags)
+scanpmzleesc(UNUSED(HashTable ht), ScanFunc func, int flags)
 {
     return scangroup(func, flags, 0);
 }
 
 /**/
 static HashNode
-getpmsgr(UNUSED(HashTable ht), const char *name)
+getpmzlesgr(UNUSED(HashTable ht), const char *name)
 {
     return getgroup(name, 1);
 }
 
 /**/
 static void
-scanpmsgr(UNUSED(HashTable ht), ScanFunc func, int flags)
+scanpmzlesgr(UNUSED(HashTable ht), ScanFunc func, int flags)
 {
     return scangroup(func, flags, 1);
 }
 
 static struct paramdef partab[] = {
-    SPECIALPMDEF(".zle.esc", PM_READONLY_SPECIAL, 0, getpmesc, scanpmesc),
-    SPECIALPMDEF(".zle.sgr", PM_READONLY_SPECIAL, 0, getpmsgr, scanpmsgr)
+    SPECIALPMDEF(".zle.esc", PM_READONLY_SPECIAL, 0, getpmzleesc, scanpmzleesc),
+    SPECIALPMDEF(".zle.sgr", PM_READONLY_SPECIAL, 0, getpmzlesgr, scanpmzlesgr)
 };
 
 static struct features module_features = {