Some fine-tunning on wrapped lubncurses and friends

6 files changed, 17 insertions, 26 deletions

diff --git a/src/librarian/globalsymbols.c b/src/librarian/globalsymbols.c
index 5b9b81d4..a6dc73c0 100755
--- a/src/librarian/globalsymbols.c
+++ b/src/librarian/globalsymbols.c
@@ -59,9 +59,9 @@ void** my_GetGTKDisplay()
 

 #endif

 // **************** NCurses ****************

-EXPORT void* COLS;

-EXPORT void* LINES;

-EXPORT void* TABSIZE;

+EXPORT int COLS;

+EXPORT int LINES;

+EXPORT int TABSIZE;

 EXPORT void* curscr;

 EXPORT void* newscr;

 EXPORT void* stdscr;

diff --git a/src/wrapped/wrappedlibncurses6_private.h b/src/wrapped/wrappedlibncurses6_private.h
index d5e7a7a7..e89cf5b7 100755
--- a/src/wrapped/wrappedlibncurses6_private.h
+++ b/src/wrapped/wrappedlibncurses6_private.h
@@ -412,13 +412,6 @@ GO(tigetstr, pFp)
 GO(tparm, pFplllllllll) // va_arg or 9 long, depending on how old the .h is
 
 DATA(COLOR_PAIRS, sizeof(void*))
-DATA(COLS, sizeof(void*))
 DATA(COLORS, sizeof(void*))
 DATA(ESCDELAY, sizeof(void*))
-DATA(LINES, sizeof(void*))
-DATA(TABSIZE, sizeof(void*))
-DATA(curscr, sizeof(void*))
-DATA(newscr, sizeof(void*))
-DATA(stdscr, sizeof(void*))
-DATA(ttytype, sizeof(void*))
 DATA(_nc_wacs, sizeof(void*))
diff --git a/src/wrapped/wrappedlibncurses_private.h b/src/wrapped/wrappedlibncurses_private.h
index a3701b22..f6c0982d 100755
--- a/src/wrapped/wrappedlibncurses_private.h
+++ b/src/wrapped/wrappedlibncurses_private.h
@@ -407,13 +407,6 @@ GO(trace, vFu)
 GO(_nc_visbuf, pFp)
 
 DATA(COLOR_PAIRS, sizeof(void*))
-DATA(COLS, sizeof(void*))
 DATA(COLORS, sizeof(void*))
 DATA(ESCDELAY, sizeof(void*))
-DATA(LINES, sizeof(void*))
-DATA(TABSIZE, sizeof(void*))
-DATA(curscr, sizeof(void*))
-DATA(newscr, sizeof(void*))
-DATA(stdscr, sizeof(void*))
-DATA(ttytype, sizeof(void*))
 DATA(_nc_wacs, sizeof(void*))
diff --git a/src/wrapped/wrappedlibncursesw_private.h b/src/wrapped/wrappedlibncursesw_private.h
index c835bfc1..76ba44e5 100755
--- a/src/wrapped/wrappedlibncursesw_private.h
+++ b/src/wrapped/wrappedlibncursesw_private.h
@@ -407,13 +407,6 @@ GO(trace, vFu)
 GO(_nc_visbuf, pFp)
 
 DATA(COLOR_PAIRS, sizeof(void*))
-DATA(COLS, sizeof(void*))
 DATA(COLORS, sizeof(void*))
 DATA(ESCDELAY, sizeof(void*))
-DATA(LINES, sizeof(void*))
-DATA(TABSIZE, sizeof(void*))
-DATA(curscr, sizeof(void*))
-DATA(newscr, sizeof(void*))
-DATA(stdscr, sizeof(void*))
-DATA(ttytype, sizeof(void*))
 DATA(_nc_wacs, sizeof(void*))
diff --git a/src/wrapped/wrappedlibtinfo6_private.h b/src/wrapped/wrappedlibtinfo6_private.h
index b530dcff..41ec64ff 100755
--- a/src/wrapped/wrappedlibtinfo6_private.h
+++ b/src/wrapped/wrappedlibtinfo6_private.h
@@ -145,9 +145,15 @@ GO(use_env, vFi)
 GO(use_extended_names, iFi)
 GO(wtimeout, vFpi)
 
+DATA(COLS, sizeof(int))
+DATA(LINES, sizeof(int))
+DATA(TABSIZE, sizeof(int))
+DATA(curscr, sizeof(void*))
+DATA(newscr, sizeof(void*))
 DATA(stdscr, sizeof(void*))
-DATA(acs_map, sizeof(void*))
+DATA(acs_map, 128*sizeof(void*))
 DATA(UP, sizeof(void*))
 DATA(BC, sizeof(void*))
 DATA(PC, 1)
 DATA(ospeed, 2)
+DATA(ttytype, sizeof(void*))
diff --git a/src/wrapped/wrappedlibtinfo_private.h b/src/wrapped/wrappedlibtinfo_private.h
index b530dcff..41ec64ff 100755
--- a/src/wrapped/wrappedlibtinfo_private.h
+++ b/src/wrapped/wrappedlibtinfo_private.h
@@ -145,9 +145,15 @@ GO(use_env, vFi)
 GO(use_extended_names, iFi)
 GO(wtimeout, vFpi)
 
+DATA(COLS, sizeof(int))
+DATA(LINES, sizeof(int))
+DATA(TABSIZE, sizeof(int))
+DATA(curscr, sizeof(void*))
+DATA(newscr, sizeof(void*))
 DATA(stdscr, sizeof(void*))
-DATA(acs_map, sizeof(void*))
+DATA(acs_map, 128*sizeof(void*))
 DATA(UP, sizeof(void*))
 DATA(BC, sizeof(void*))
 DATA(PC, 1)
 DATA(ospeed, 2)
+DATA(ttytype, sizeof(void*))