fish 3.4.0 not building on OpenIndiana

[balrog-nona]

Hi, I'm trying to build the latest fish version (3.4.0) on OpenIndiana. When runnnig gmake build I get this error:

In file included from /export/home/nona/oi-userland/components/shell/fish/fish-3.4.0/src/builtins/../common.h:23:0,
                 from /export/home/nona/oi-userland/components/shell/fish/fish-3.4.0/src/builtins/../io.h:15,
                 from /export/home/nona/oi-userland/components/shell/fish/fish-3.4.0/src/builtins/set_color.h:8,
                 from /export/home/nona/oi-userland/components/shell/fish/fish-3.4.0/src/builtins/set_color.cpp:4:
/export/home/nona/oi-userland/components/shell/fish/fish-3.4.0/src/builtins/../fallback.h:71:15: error: conflicting declaration of 'char* tparm_solaris_kludge(char*, long int, long int, long int, long int, long int, long int, long int, long int, long int)' with 'C' linkage
 #define tparm tparm_solaris_kludge
               ^
/export/home/nona/oi-userland/components/shell/fish/fish-3.4.0/src/builtins/../fallback.h:72:7: note: previous declaration with 'C++' linkage
 char *tparm_solaris_kludge(char *str, long p1 = 0, long p2 = 0, long p3 = 0, long p4 = 0,
       ^~~~~~~~~~~~~~~~~~~~
make[3]: *** [CMakeFiles/fishlib.dir/build.make:1284: CMakeFiles/fishlib.dir/src/builtins/set_color.cpp.o] Error 1
make[3]: *** Waiting for unfinished jobs....
make[3]: Leaving directory '/export/home/nona/oi-userland/components/shell/fish/build/amd64'
make[2]: *** [CMakeFiles/Makefile2:610: CMakeFiles/fishlib.dir/all] Error 2
make[2]: Leaving directory '/export/home/nona/oi-userland/components/shell/fish/build/amd64'
make[1]: *** [Makefile:136: all] Error 2
make[1]: Leaving directory '/export/home/nona/oi-userland/components/shell/fish/build/amd64'
gmake: *** [/export/home/nona/oi-userland/make-rules/cmake.mk:179: /export/home/nona/oi-userland/components/shell/fish/build/amd64/.built] Error 2

I see that char *tparm_solaris_kludge isn't something new in the latest release and I believe that it worked in the previous version (3.3.1) because it was successfully built for OpenIndiana.
uname -a gives me: SunOS openindiana 5.11 illumos-bf41048984 i86pc i386 i86pc
echo $TERM gives me: xterm-256color

[faho]

What happens here is that:

1. Solaris' tparm is awkward and only takes a fixed number of arguments
2. We try to hack around it by defining a C++-function that takes a large number of arguments with defaults and then calls the system tparm
3. We redefine tparm to call that function
4. Something changed so that we redefine tparm too much or too little, and so the compiler sees two definitions of that function
5. Essentially nobody runs fish on OpenIndiana, especially not prerelease code
6. BOOM