ncurses 6.2 - patch 20211002

[ncurses.git] / ncurses / base / MKlib_gen.sh

diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
index 26e473b4bf8fa50646661d52c480571a9fa0c8a1..9dc08557c6dff52f75d278cadc47f61805ced0ea 100755 (executable)
--- a/ncurses/base/MKlib_gen.sh
+++ b/ncurses/base/MKlib_gen.sh
@@ -2,7 +2,7 @@
 #
 # MKlib_gen.sh -- generate sources from curses.h macro definitions
 #
-# ($Id: MKlib_gen.sh,v 1.70 2021/09/24 19:23:20 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.71 2021/09/26 22:08:53 tom Exp $)
 #
 ##############################################################################
 # Copyright 2018-2020,2021 Thomas E. Dickey                                  #
@@ -470,9 +470,9 @@ END         {
                                if ( value !~ /P_POUNDC/ ) {
                                        gsub(/[ \t]+/," ",value);
                                        sub(/^[0-9a-zA-Z_]+ /,"",value);
-                                       sub(/^\* /,"",value);
-                                       gsub("struct [0-9a-zA-Z_]+ \*","",value);
-                                       gsub(/[0-9a-zA-Z_]+ \* /,"",value);
+                                       sub(/^[*][ \t]*/,"",value);
+                                       gsub("struct[ \t]*[0-9a-zA-Z_]+[ \t]*[*]","",value);
+                                       gsub(/[0-9a-zA-Z_]+[ \t]*[*][ \t]*/,"",value);
                                        gsub(/ (const) /," ",value);
                                        gsub(/ (int|short|attr_t|chtype|wchar_t|NCURSES_BOOL|NCURSES_OUTC|NCURSES_OUTC_sp|va_list) /," ",value);
                                        gsub(/ void /,"",value);