[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2086: improve curses/cursesw (bugs 1751, 2970)

Mats Wichmann mats at linuxfoundation.org
Fri Mar 1 18:58:00 UTC 2013


------------------------------------------------------------
revno: 2086
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Fri 2013-03-01 11:58:00 -0700
message:
  improve curses/cursesw (bugs 1751, 2970)
modified:
  headers/All/5.0/curses.h.defs
  headers/All/5.0/ncursesw/curses.h.defs
  headers/All/5.0/term.h.defs
  headers/curses.h
  headers/ncursesw/curses.h
  headers/term.h
  package/Makefile
  stub_libs/5.0/IA32/libncurses.c
  stub_libs/5.0/IA32/libncursesw.c
  stub_libs/5.0/IA64/libncurses.c
  stub_libs/5.0/IA64/libncursesw.c
  stub_libs/5.0/PPC32/libncurses.c
  stub_libs/5.0/PPC32/libncursesw.c
  stub_libs/5.0/PPC64/libncurses.c
  stub_libs/5.0/PPC64/libncursesw.c
  stub_libs/5.0/S390/libncurses.c
  stub_libs/5.0/S390/libncursesw.c
  stub_libs/5.0/S390X/libncurses.c
  stub_libs/5.0/S390X/libncursesw.c
  stub_libs/5.0/x86-64/libncurses.c
  stub_libs/5.0/x86-64/libncursesw.c
-------------- next part --------------
=== modified file 'headers/All/5.0/curses.h.defs'
--- a/headers/All/5.0/curses.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/All/5.0/curses.h.defs	2013-03-01 18:58:00 +0000
@@ -1,4 +1,5 @@
 
+#define getattrs(win)	((win)?(win)->_attrs:A_NORMAL)
 #define ERR	(-1)
 #define OK	(0)
 #define ACS_RARROW	(acs_map['+'])
@@ -26,6 +27,8 @@
 #define ACS_VLINE	(acs_map['x'])
 #define ACS_DIAMOND	(acs_map['`'])
 #define ACS_BULLET	(acs_map['~'])
+#define setsyx(y,x)	do{if((y)==-1&&(x)==-1)newscr->_leaveok=TRUE;else{newscr->_leaveok=FALSE;wmove(newscr,(y),(x));}}while(0)
+#define getsyx(y,x)	do{if(newscr->_leaveok)(y)=(x)=-1;elsegetyx(newscr,(y),(x));}while(0)
 #define getmaxyx(win,y,x)	\
 	(y=(win)?((win)->_maxy+1):ERR,x=(win)?((win)->_maxx+1):ERR)
 #define getbegyx(win,y,x)	\
@@ -384,6 +387,7 @@
 extern int mvwvline(WINDOW *, int, int, chtype, int);
 extern int napms(int);
 extern WINDOW *newpad(int, int);
+extern WINDOW *newscr;
 extern SCREEN *newterm(const char *, FILE *, FILE *);
 extern WINDOW *newwin(int, int, int, int);
 extern int nl(void);

=== modified file 'headers/All/5.0/ncursesw/curses.h.defs'
--- a/headers/All/5.0/ncursesw/curses.h.defs	2013-02-27 18:33:21 +0000
+++ b/headers/All/5.0/ncursesw/curses.h.defs	2013-03-01 18:58:00 +0000
@@ -1,5 +1,21 @@
 
 #define CURSES	1
+#define setsyx(y,x)	do { if (newscr) { \
+				 if ((y) == -1 && (x) == -1) \
+					 leaveok(newscr, TRUE); \
+				 else { \
+					 leaveok(newscr, FALSE); \
+					 wmove(newscr, (y), (x)); \
+				} \
+			 } \
+		  } while(0)
+#define getsyx(y,x)	do { if (newscr) { \
+				 if (is_leaveok(newscr)) \
+					 (y) = (x) = -1; \
+				 else \
+					 getyx(newscr,(y), (x)); \
+			 } \
+		 } while(0)
 #define CURSES_H	1
 #define NCURSES_VERSION_MAJOR	5
 #define NCURSES_VERSION_MINOR	9

=== modified file 'headers/All/5.0/term.h.defs'
--- a/headers/All/5.0/term.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/All/5.0/term.h.defs	2013-03-01 18:58:00 +0000
@@ -15,3 +15,4 @@
 extern char *tigetstr(const char *);
 extern char *tparm(const char *, ...);
 extern int tputs(const char *, int, int (*)(int));
+extern char ttytype[];

=== modified file 'headers/curses.h'
--- a/headers/curses.h	2013-01-08 15:55:54 +0000
+++ b/headers/curses.h	2013-03-01 18:58:00 +0000
@@ -52,6 +52,12 @@
 #define ACS_BULLET	(acs_map['~'])
 #endif				/* __LSB_VERSION__ >= 2.0 */
 
+#if __LSB_VERSION__ >= 50
+#define getattrs(win)	((win)?(win)->_attrs:A_NORMAL)
+#define setsyx(y,x)	do{if((y)==-1&&(x)==-1)newscr->_leaveok=TRUE;else{newscr->_leaveok=FALSE;wmove(newscr,(y),(x));}}while(0)
+#define getsyx(y,x)	do{if(newscr->_leaveok)(y)=(x)=-1;elsegetyx(newscr,(y),(x));}while(0)
+#endif				/* __LSB_VERSION__ >= 5.0 */
+
 
 
     struct ldat;
@@ -720,6 +726,10 @@
     extern const char *unctrl(chtype);
 #endif				/* __LSB_VERSION__ >= 2.0 */
 
+#if __LSB_VERSION__ >= 50
+    extern WINDOW *newscr;
+#endif				/* __LSB_VERSION__ >= 5.0 */
+
 #ifdef __cplusplus
 }
 #endif

=== modified file 'headers/ncursesw/curses.h'
--- a/headers/ncursesw/curses.h	2013-02-27 18:33:21 +0000
+++ b/headers/ncursesw/curses.h	2013-03-01 18:58:00 +0000
@@ -14,6 +14,22 @@
 
 
 #define CURSES	1
+#define setsyx(y,x)	do { if (newscr) { \
+				 if ((y) == -1 && (x) == -1) \
+					 leaveok(newscr, TRUE); \
+				 else { \
+					 leaveok(newscr, FALSE); \
+					 wmove(newscr, (y), (x)); \
+				} \
+			 } \
+		  } while(0)
+#define getsyx(y,x)	do { if (newscr) { \
+				 if (is_leaveok(newscr)) \
+					 (y) = (x) = -1; \
+				 else \
+					 getyx(newscr,(y), (x)); \
+			 } \
+		 } while(0)
 #define CURSES_H	1
 #define NCURSES_VERSION_MAJOR	5
 #define NCURSES_VERSION_MINOR	9

=== modified file 'headers/term.h'
--- a/headers/term.h	2010-04-14 12:46:56 +0000
+++ b/headers/term.h	2013-03-01 18:58:00 +0000
@@ -68,6 +68,10 @@
     extern TERMINAL *set_curterm(TERMINAL *);
 #endif				/* __LSB_VERSION__ >= 2.0 */
 
+#if __LSB_VERSION__ >= 50
+    extern char ttytype[];
+#endif				/* __LSB_VERSION__ >= 5.0 */
+
 #ifdef __cplusplus
 }
 #endif

=== modified file 'package/Makefile'
--- a/package/Makefile	2013-03-01 16:23:48 +0000
+++ b/package/Makefile	2013-03-01 18:58:00 +0000
@@ -46,7 +46,7 @@
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=2
+RPM_PACKAGE_RELEASE=3
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)

=== modified file 'stub_libs/5.0/IA32/libncurses.c'
--- a/stub_libs/5.0/IA32/libncurses.c	2009-10-22 20:11:53 +0000
+++ b/stub_libs/5.0/IA32/libncurses.c	2013-03-01 18:58:00 +0000
@@ -280,4 +280,6 @@
 __asm__(".globl acs_map; .pushsection .data; .type acs_map, at object; .size acs_map, 512; acs_map: .long 0; .popsection");
 __asm__(".globl cur_term; .pushsection .data; .type cur_term, at object; .size cur_term, 4; cur_term: .long 0; .popsection");
 __asm__(".globl curscr; .pushsection .data; .type curscr, at object; .size curscr, 4; curscr: .long 0; .popsection");
+__asm__(".globl newscr; .pushsection .data; .type newscr, at object; .size newscr, 4; newscr: .long 0; .popsection");
 __asm__(".globl stdscr; .pushsection .data; .type stdscr, at object; .size stdscr, 4; stdscr: .long 0; .popsection");
+__asm__(".globl ttytype; .pushsection .data; .type ttytype, at object; .size ttytype, 4; ttytype: .long 0; .popsection");

=== modified file 'stub_libs/5.0/IA32/libncursesw.c'
--- a/stub_libs/5.0/IA32/libncursesw.c	2013-02-27 18:33:21 +0000
+++ b/stub_libs/5.0/IA32/libncursesw.c	2013-03-01 18:58:00 +0000
@@ -398,17 +398,8 @@
 __asm__(".globl LINES; .pushsection .data; .type LINES, at object; .size LINES, 4; LINES: .long 0; .popsection");
 __asm__(".globl TABSIZE; .pushsection .data; .type TABSIZE, at object; .size TABSIZE, 4; TABSIZE: .long 0; .popsection");
 __asm__(".globl acs_map; .pushsection .data; .type acs_map, at object; .size acs_map, 512; acs_map: .long 0; .popsection");
-__asm__(".globl boolcodes; .pushsection .data; .type boolcodes, at object; .size boolcodes, 4; boolcodes: .long 0; .popsection");
-__asm__(".globl boolfnames; .pushsection .data; .type boolfnames, at object; .size boolfnames, 4; boolfnames: .long 0; .popsection");
-__asm__(".globl boolnames; .pushsection .data; .type boolnames, at object; .size boolnames, 4; boolnames: .long 0; .popsection");
 __asm__(".globl cur_term; .pushsection .data; .type cur_term, at object; .size cur_term, 4; cur_term: .long 0; .popsection");
 __asm__(".globl curscr; .pushsection .data; .type curscr, at object; .size curscr, 4; curscr: .long 0; .popsection");
 __asm__(".globl newscr; .pushsection .data; .type newscr, at object; .size newscr, 4; newscr: .long 0; .popsection");
-__asm__(".globl numcodes; .pushsection .data; .type numcodes, at object; .size numcodes, 4; numcodes: .long 0; .popsection");
-__asm__(".globl numfnames; .pushsection .data; .type numfnames, at object; .size numfnames, 4; numfnames: .long 0; .popsection");
-__asm__(".globl numnames; .pushsection .data; .type numnames, at object; .size numnames, 4; numnames: .long 0; .popsection");
 __asm__(".globl stdscr; .pushsection .data; .type stdscr, at object; .size stdscr, 4; stdscr: .long 0; .popsection");
-__asm__(".globl strcodes; .pushsection .data; .type strcodes, at object; .size strcodes, 4; strcodes: .long 0; .popsection");
-__asm__(".globl strfnames; .pushsection .data; .type strfnames, at object; .size strfnames, 4; strfnames: .long 0; .popsection");
-__asm__(".globl strnames; .pushsection .data; .type strnames, at object; .size strnames, 4; strnames: .long 0; .popsection");
 __asm__(".globl ttytype; .pushsection .data; .type ttytype, at object; .size ttytype, 4; ttytype: .long 0; .popsection");

=== modified file 'stub_libs/5.0/IA64/libncurses.c'
--- a/stub_libs/5.0/IA64/libncurses.c	2009-10-22 20:11:53 +0000
+++ b/stub_libs/5.0/IA64/libncurses.c	2013-03-01 18:58:00 +0000
@@ -280,4 +280,6 @@
 __asm__(".globl acs_map; .pushsection .data; .type acs_map, at object; .size acs_map, 1024; acs_map: .long 0; .popsection");
 __asm__(".globl cur_term; .pushsection .data; .type cur_term, at object; .size cur_term, 8; cur_term: .long 0; .popsection");
 __asm__(".globl curscr; .pushsection .data; .type curscr, at object; .size curscr, 8; curscr: .long 0; .popsection");
+__asm__(".globl newscr; .pushsection .data; .type newscr, at object; .size newscr, 8; newscr: .long 0; .popsection");
 __asm__(".globl stdscr; .pushsection .data; .type stdscr, at object; .size stdscr, 8; stdscr: .long 0; .popsection");
+__asm__(".globl ttytype; .pushsection .data; .type ttytype, at object; .size ttytype, 4; ttytype: .long 0; .popsection");

=== modified file 'stub_libs/5.0/IA64/libncursesw.c'
--- a/stub_libs/5.0/IA64/libncursesw.c	2013-02-27 18:33:21 +0000
+++ b/stub_libs/5.0/IA64/libncursesw.c	2013-03-01 18:58:00 +0000
@@ -398,17 +398,8 @@
 __asm__(".globl LINES; .pushsection .data; .type LINES, at object; .size LINES, 4; LINES: .long 0; .popsection");
 __asm__(".globl TABSIZE; .pushsection .data; .type TABSIZE, at object; .size TABSIZE, 4; TABSIZE: .long 0; .popsection");
 __asm__(".globl acs_map; .pushsection .data; .type acs_map, at object; .size acs_map, 1024; acs_map: .long 0; .popsection");
-__asm__(".globl boolcodes; .pushsection .data; .type boolcodes, at object; .size boolcodes, 4; boolcodes: .long 0; .popsection");
-__asm__(".globl boolfnames; .pushsection .data; .type boolfnames, at object; .size boolfnames, 4; boolfnames: .long 0; .popsection");
-__asm__(".globl boolnames; .pushsection .data; .type boolnames, at object; .size boolnames, 4; boolnames: .long 0; .popsection");
-__asm__(".globl cur_term; .pushsection .data; .type cur_term, at object; .size cur_term, 4; cur_term: .long 0; .popsection");
-__asm__(".globl curscr; .pushsection .data; .type curscr, at object; .size curscr, 4; curscr: .long 0; .popsection");
-__asm__(".globl newscr; .pushsection .data; .type newscr, at object; .size newscr, 4; newscr: .long 0; .popsection");
-__asm__(".globl numcodes; .pushsection .data; .type numcodes, at object; .size numcodes, 4; numcodes: .long 0; .popsection");
-__asm__(".globl numfnames; .pushsection .data; .type numfnames, at object; .size numfnames, 4; numfnames: .long 0; .popsection");
-__asm__(".globl numnames; .pushsection .data; .type numnames, at object; .size numnames, 4; numnames: .long 0; .popsection");
-__asm__(".globl stdscr; .pushsection .data; .type stdscr, at object; .size stdscr, 4; stdscr: .long 0; .popsection");
-__asm__(".globl strcodes; .pushsection .data; .type strcodes, at object; .size strcodes, 4; strcodes: .long 0; .popsection");
-__asm__(".globl strfnames; .pushsection .data; .type strfnames, at object; .size strfnames, 4; strfnames: .long 0; .popsection");
-__asm__(".globl strnames; .pushsection .data; .type strnames, at object; .size strnames, 4; strnames: .long 0; .popsection");
+__asm__(".globl cur_term; .pushsection .data; .type cur_term, at object; .size cur_term, 8; cur_term: .long 0; .popsection");
+__asm__(".globl curscr; .pushsection .data; .type curscr, at object; .size curscr, 8; curscr: .long 0; .popsection");
+__asm__(".globl newscr; .pushsection .data; .type newscr, at object; .size newscr, 8; newscr: .long 0; .popsection");
+__asm__(".globl stdscr; .pushsection .data; .type stdscr, at object; .size stdscr, 8; stdscr: .long 0; .popsection");
 __asm__(".globl ttytype; .pushsection .data; .type ttytype, at object; .size ttytype, 4; ttytype: .long 0; .popsection");

=== modified file 'stub_libs/5.0/PPC32/libncurses.c'
--- a/stub_libs/5.0/PPC32/libncurses.c	2009-10-22 20:11:53 +0000
+++ b/stub_libs/5.0/PPC32/libncurses.c	2013-03-01 18:58:00 +0000
@@ -280,4 +280,6 @@
 __asm__(".globl acs_map; .pushsection .data; .type acs_map, at object; .size acs_map, 512; acs_map: .long 0; .popsection");
 __asm__(".globl cur_term; .pushsection .data; .type cur_term, at object; .size cur_term, 4; cur_term: .long 0; .popsection");
 __asm__(".globl curscr; .pushsection .data; .type curscr, at object; .size curscr, 4; curscr: .long 0; .popsection");
+__asm__(".globl newscr; .pushsection .data; .type newscr, at object; .size newscr, 4; newscr: .long 0; .popsection");
 __asm__(".globl stdscr; .pushsection .data; .type stdscr, at object; .size stdscr, 4; stdscr: .long 0; .popsection");
+__asm__(".globl ttytype; .pushsection .data; .type ttytype, at object; .size ttytype, 4; ttytype: .long 0; .popsection");

=== modified file 'stub_libs/5.0/PPC32/libncursesw.c'
--- a/stub_libs/5.0/PPC32/libncursesw.c	2013-02-27 18:33:21 +0000
+++ b/stub_libs/5.0/PPC32/libncursesw.c	2013-03-01 18:58:00 +0000
@@ -398,17 +398,8 @@
 __asm__(".globl LINES; .pushsection .data; .type LINES, at object; .size LINES, 4; LINES: .long 0; .popsection");
 __asm__(".globl TABSIZE; .pushsection .data; .type TABSIZE, at object; .size TABSIZE, 4; TABSIZE: .long 0; .popsection");
 __asm__(".globl acs_map; .pushsection .data; .type acs_map, at object; .size acs_map, 512; acs_map: .long 0; .popsection");
-__asm__(".globl boolcodes; .pushsection .data; .type boolcodes, at object; .size boolcodes, 4; boolcodes: .long 0; .popsection");
-__asm__(".globl boolfnames; .pushsection .data; .type boolfnames, at object; .size boolfnames, 4; boolfnames: .long 0; .popsection");
-__asm__(".globl boolnames; .pushsection .data; .type boolnames, at object; .size boolnames, 4; boolnames: .long 0; .popsection");
 __asm__(".globl cur_term; .pushsection .data; .type cur_term, at object; .size cur_term, 4; cur_term: .long 0; .popsection");
 __asm__(".globl curscr; .pushsection .data; .type curscr, at object; .size curscr, 4; curscr: .long 0; .popsection");
 __asm__(".globl newscr; .pushsection .data; .type newscr, at object; .size newscr, 4; newscr: .long 0; .popsection");
-__asm__(".globl numcodes; .pushsection .data; .type numcodes, at object; .size numcodes, 4; numcodes: .long 0; .popsection");
-__asm__(".globl numfnames; .pushsection .data; .type numfnames, at object; .size numfnames, 4; numfnames: .long 0; .popsection");
-__asm__(".globl numnames; .pushsection .data; .type numnames, at object; .size numnames, 4; numnames: .long 0; .popsection");
 __asm__(".globl stdscr; .pushsection .data; .type stdscr, at object; .size stdscr, 4; stdscr: .long 0; .popsection");
-__asm__(".globl strcodes; .pushsection .data; .type strcodes, at object; .size strcodes, 4; strcodes: .long 0; .popsection");
-__asm__(".globl strfnames; .pushsection .data; .type strfnames, at object; .size strfnames, 4; strfnames: .long 0; .popsection");
-__asm__(".globl strnames; .pushsection .data; .type strnames, at object; .size strnames, 4; strnames: .long 0; .popsection");
 __asm__(".globl ttytype; .pushsection .data; .type ttytype, at object; .size ttytype, 4; ttytype: .long 0; .popsection");

=== modified file 'stub_libs/5.0/PPC64/libncurses.c'
--- a/stub_libs/5.0/PPC64/libncurses.c	2009-10-22 20:11:53 +0000
+++ b/stub_libs/5.0/PPC64/libncurses.c	2013-03-01 18:58:00 +0000
@@ -280,4 +280,6 @@
 __asm__(".globl acs_map; .pushsection .data; .type acs_map, at object; .size acs_map, 1024; acs_map: .long 0; .popsection");
 __asm__(".globl cur_term; .pushsection .data; .type cur_term, at object; .size cur_term, 8; cur_term: .long 0; .popsection");
 __asm__(".globl curscr; .pushsection .data; .type curscr, at object; .size curscr, 8; curscr: .long 0; .popsection");
+__asm__(".globl newscr; .pushsection .data; .type newscr, at object; .size newscr, 8; newscr: .long 0; .popsection");
 __asm__(".globl stdscr; .pushsection .data; .type stdscr, at object; .size stdscr, 8; stdscr: .long 0; .popsection");
+__asm__(".globl ttytype; .pushsection .data; .type ttytype, at object; .size ttytype, 4; ttytype: .long 0; .popsection");

=== modified file 'stub_libs/5.0/PPC64/libncursesw.c'
--- a/stub_libs/5.0/PPC64/libncursesw.c	2013-02-27 18:33:21 +0000
+++ b/stub_libs/5.0/PPC64/libncursesw.c	2013-03-01 18:58:00 +0000
@@ -398,17 +398,8 @@
 __asm__(".globl LINES; .pushsection .data; .type LINES, at object; .size LINES, 4; LINES: .long 0; .popsection");
 __asm__(".globl TABSIZE; .pushsection .data; .type TABSIZE, at object; .size TABSIZE, 4; TABSIZE: .long 0; .popsection");
 __asm__(".globl acs_map; .pushsection .data; .type acs_map, at object; .size acs_map, 1024; acs_map: .long 0; .popsection");
-__asm__(".globl boolcodes; .pushsection .data; .type boolcodes, at object; .size boolcodes, 4; boolcodes: .long 0; .popsection");
-__asm__(".globl boolfnames; .pushsection .data; .type boolfnames, at object; .size boolfnames, 4; boolfnames: .long 0; .popsection");
-__asm__(".globl boolnames; .pushsection .data; .type boolnames, at object; .size boolnames, 4; boolnames: .long 0; .popsection");
-__asm__(".globl cur_term; .pushsection .data; .type cur_term, at object; .size cur_term, 4; cur_term: .long 0; .popsection");
-__asm__(".globl curscr; .pushsection .data; .type curscr, at object; .size curscr, 4; curscr: .long 0; .popsection");
-__asm__(".globl newscr; .pushsection .data; .type newscr, at object; .size newscr, 4; newscr: .long 0; .popsection");
-__asm__(".globl numcodes; .pushsection .data; .type numcodes, at object; .size numcodes, 4; numcodes: .long 0; .popsection");
-__asm__(".globl numfnames; .pushsection .data; .type numfnames, at object; .size numfnames, 4; numfnames: .long 0; .popsection");
-__asm__(".globl numnames; .pushsection .data; .type numnames, at object; .size numnames, 4; numnames: .long 0; .popsection");
-__asm__(".globl stdscr; .pushsection .data; .type stdscr, at object; .size stdscr, 4; stdscr: .long 0; .popsection");
-__asm__(".globl strcodes; .pushsection .data; .type strcodes, at object; .size strcodes, 4; strcodes: .long 0; .popsection");
-__asm__(".globl strfnames; .pushsection .data; .type strfnames, at object; .size strfnames, 4; strfnames: .long 0; .popsection");
-__asm__(".globl strnames; .pushsection .data; .type strnames, at object; .size strnames, 4; strnames: .long 0; .popsection");
+__asm__(".globl cur_term; .pushsection .data; .type cur_term, at object; .size cur_term, 8; cur_term: .long 0; .popsection");
+__asm__(".globl curscr; .pushsection .data; .type curscr, at object; .size curscr, 8; curscr: .long 0; .popsection");
+__asm__(".globl newscr; .pushsection .data; .type newscr, at object; .size newscr, 8; newscr: .long 0; .popsection");
+__asm__(".globl stdscr; .pushsection .data; .type stdscr, at object; .size stdscr, 8; stdscr: .long 0; .popsection");
 __asm__(".globl ttytype; .pushsection .data; .type ttytype, at object; .size ttytype, 4; ttytype: .long 0; .popsection");

=== modified file 'stub_libs/5.0/S390/libncurses.c'
--- a/stub_libs/5.0/S390/libncurses.c	2009-10-22 20:11:53 +0000
+++ b/stub_libs/5.0/S390/libncurses.c	2013-03-01 18:58:00 +0000
@@ -280,4 +280,6 @@
 __asm__(".globl acs_map; .pushsection .data; .type acs_map, at object; .size acs_map, 512; acs_map: .long 0; .popsection");
 __asm__(".globl cur_term; .pushsection .data; .type cur_term, at object; .size cur_term, 4; cur_term: .long 0; .popsection");
 __asm__(".globl curscr; .pushsection .data; .type curscr, at object; .size curscr, 4; curscr: .long 0; .popsection");
+__asm__(".globl newscr; .pushsection .data; .type newscr, at object; .size newscr, 4; newscr: .long 0; .popsection");
 __asm__(".globl stdscr; .pushsection .data; .type stdscr, at object; .size stdscr, 4; stdscr: .long 0; .popsection");
+__asm__(".globl ttytype; .pushsection .data; .type ttytype, at object; .size ttytype, 4; ttytype: .long 0; .popsection");

=== modified file 'stub_libs/5.0/S390/libncursesw.c'
--- a/stub_libs/5.0/S390/libncursesw.c	2013-02-27 18:33:21 +0000
+++ b/stub_libs/5.0/S390/libncursesw.c	2013-03-01 18:58:00 +0000
@@ -398,17 +398,8 @@
 __asm__(".globl LINES; .pushsection .data; .type LINES, at object; .size LINES, 4; LINES: .long 0; .popsection");
 __asm__(".globl TABSIZE; .pushsection .data; .type TABSIZE, at object; .size TABSIZE, 4; TABSIZE: .long 0; .popsection");
 __asm__(".globl acs_map; .pushsection .data; .type acs_map, at object; .size acs_map, 512; acs_map: .long 0; .popsection");
-__asm__(".globl boolcodes; .pushsection .data; .type boolcodes, at object; .size boolcodes, 4; boolcodes: .long 0; .popsection");
-__asm__(".globl boolfnames; .pushsection .data; .type boolfnames, at object; .size boolfnames, 4; boolfnames: .long 0; .popsection");
-__asm__(".globl boolnames; .pushsection .data; .type boolnames, at object; .size boolnames, 4; boolnames: .long 0; .popsection");
 __asm__(".globl cur_term; .pushsection .data; .type cur_term, at object; .size cur_term, 4; cur_term: .long 0; .popsection");
 __asm__(".globl curscr; .pushsection .data; .type curscr, at object; .size curscr, 4; curscr: .long 0; .popsection");
 __asm__(".globl newscr; .pushsection .data; .type newscr, at object; .size newscr, 4; newscr: .long 0; .popsection");
-__asm__(".globl numcodes; .pushsection .data; .type numcodes, at object; .size numcodes, 4; numcodes: .long 0; .popsection");
-__asm__(".globl numfnames; .pushsection .data; .type numfnames, at object; .size numfnames, 4; numfnames: .long 0; .popsection");
-__asm__(".globl numnames; .pushsection .data; .type numnames, at object; .size numnames, 4; numnames: .long 0; .popsection");
 __asm__(".globl stdscr; .pushsection .data; .type stdscr, at object; .size stdscr, 4; stdscr: .long 0; .popsection");
-__asm__(".globl strcodes; .pushsection .data; .type strcodes, at object; .size strcodes, 4; strcodes: .long 0; .popsection");
-__asm__(".globl strfnames; .pushsection .data; .type strfnames, at object; .size strfnames, 4; strfnames: .long 0; .popsection");
-__asm__(".globl strnames; .pushsection .data; .type strnames, at object; .size strnames, 4; strnames: .long 0; .popsection");
 __asm__(".globl ttytype; .pushsection .data; .type ttytype, at object; .size ttytype, 4; ttytype: .long 0; .popsection");

=== modified file 'stub_libs/5.0/S390X/libncurses.c'
--- a/stub_libs/5.0/S390X/libncurses.c	2009-10-22 20:11:53 +0000
+++ b/stub_libs/5.0/S390X/libncurses.c	2013-03-01 18:58:00 +0000
@@ -280,4 +280,6 @@
 __asm__(".globl acs_map; .pushsection .data; .type acs_map, at object; .size acs_map, 1024; acs_map: .long 0; .popsection");
 __asm__(".globl cur_term; .pushsection .data; .type cur_term, at object; .size cur_term, 8; cur_term: .long 0; .popsection");
 __asm__(".globl curscr; .pushsection .data; .type curscr, at object; .size curscr, 8; curscr: .long 0; .popsection");
+__asm__(".globl newscr; .pushsection .data; .type newscr, at object; .size newscr, 8; newscr: .long 0; .popsection");
 __asm__(".globl stdscr; .pushsection .data; .type stdscr, at object; .size stdscr, 8; stdscr: .long 0; .popsection");
+__asm__(".globl ttytype; .pushsection .data; .type ttytype, at object; .size ttytype, 4; ttytype: .long 0; .popsection");

=== modified file 'stub_libs/5.0/S390X/libncursesw.c'
--- a/stub_libs/5.0/S390X/libncursesw.c	2013-02-27 18:33:21 +0000
+++ b/stub_libs/5.0/S390X/libncursesw.c	2013-03-01 18:58:00 +0000
@@ -398,17 +398,8 @@
 __asm__(".globl LINES; .pushsection .data; .type LINES, at object; .size LINES, 4; LINES: .long 0; .popsection");
 __asm__(".globl TABSIZE; .pushsection .data; .type TABSIZE, at object; .size TABSIZE, 4; TABSIZE: .long 0; .popsection");
 __asm__(".globl acs_map; .pushsection .data; .type acs_map, at object; .size acs_map, 1024; acs_map: .long 0; .popsection");
-__asm__(".globl boolcodes; .pushsection .data; .type boolcodes, at object; .size boolcodes, 4; boolcodes: .long 0; .popsection");
-__asm__(".globl boolfnames; .pushsection .data; .type boolfnames, at object; .size boolfnames, 4; boolfnames: .long 0; .popsection");
-__asm__(".globl boolnames; .pushsection .data; .type boolnames, at object; .size boolnames, 4; boolnames: .long 0; .popsection");
-__asm__(".globl cur_term; .pushsection .data; .type cur_term, at object; .size cur_term, 4; cur_term: .long 0; .popsection");
-__asm__(".globl curscr; .pushsection .data; .type curscr, at object; .size curscr, 4; curscr: .long 0; .popsection");
-__asm__(".globl newscr; .pushsection .data; .type newscr, at object; .size newscr, 4; newscr: .long 0; .popsection");
-__asm__(".globl numcodes; .pushsection .data; .type numcodes, at object; .size numcodes, 4; numcodes: .long 0; .popsection");
-__asm__(".globl numfnames; .pushsection .data; .type numfnames, at object; .size numfnames, 4; numfnames: .long 0; .popsection");
-__asm__(".globl numnames; .pushsection .data; .type numnames, at object; .size numnames, 4; numnames: .long 0; .popsection");
-__asm__(".globl stdscr; .pushsection .data; .type stdscr, at object; .size stdscr, 4; stdscr: .long 0; .popsection");
-__asm__(".globl strcodes; .pushsection .data; .type strcodes, at object; .size strcodes, 4; strcodes: .long 0; .popsection");
-__asm__(".globl strfnames; .pushsection .data; .type strfnames, at object; .size strfnames, 4; strfnames: .long 0; .popsection");
-__asm__(".globl strnames; .pushsection .data; .type strnames, at object; .size strnames, 4; strnames: .long 0; .popsection");
+__asm__(".globl cur_term; .pushsection .data; .type cur_term, at object; .size cur_term, 8; cur_term: .long 0; .popsection");
+__asm__(".globl curscr; .pushsection .data; .type curscr, at object; .size curscr, 8; curscr: .long 0; .popsection");
+__asm__(".globl newscr; .pushsection .data; .type newscr, at object; .size newscr, 8; newscr: .long 0; .popsection");
+__asm__(".globl stdscr; .pushsection .data; .type stdscr, at object; .size stdscr, 8; stdscr: .long 0; .popsection");
 __asm__(".globl ttytype; .pushsection .data; .type ttytype, at object; .size ttytype, 4; ttytype: .long 0; .popsection");

=== modified file 'stub_libs/5.0/x86-64/libncurses.c'
--- a/stub_libs/5.0/x86-64/libncurses.c	2009-10-22 20:11:53 +0000
+++ b/stub_libs/5.0/x86-64/libncurses.c	2013-03-01 18:58:00 +0000
@@ -280,4 +280,6 @@
 __asm__(".globl acs_map; .pushsection .data; .type acs_map, at object; .size acs_map, 1024; acs_map: .long 0; .popsection");
 __asm__(".globl cur_term; .pushsection .data; .type cur_term, at object; .size cur_term, 8; cur_term: .long 0; .popsection");
 __asm__(".globl curscr; .pushsection .data; .type curscr, at object; .size curscr, 8; curscr: .long 0; .popsection");
+__asm__(".globl newscr; .pushsection .data; .type newscr, at object; .size newscr, 8; newscr: .long 0; .popsection");
 __asm__(".globl stdscr; .pushsection .data; .type stdscr, at object; .size stdscr, 8; stdscr: .long 0; .popsection");
+__asm__(".globl ttytype; .pushsection .data; .type ttytype, at object; .size ttytype, 4; ttytype: .long 0; .popsection");

=== modified file 'stub_libs/5.0/x86-64/libncursesw.c'
--- a/stub_libs/5.0/x86-64/libncursesw.c	2013-02-27 18:33:21 +0000
+++ b/stub_libs/5.0/x86-64/libncursesw.c	2013-03-01 18:58:00 +0000
@@ -398,17 +398,8 @@
 __asm__(".globl LINES; .pushsection .data; .type LINES, at object; .size LINES, 4; LINES: .long 0; .popsection");
 __asm__(".globl TABSIZE; .pushsection .data; .type TABSIZE, at object; .size TABSIZE, 4; TABSIZE: .long 0; .popsection");
 __asm__(".globl acs_map; .pushsection .data; .type acs_map, at object; .size acs_map, 1024; acs_map: .long 0; .popsection");
-__asm__(".globl boolcodes; .pushsection .data; .type boolcodes, at object; .size boolcodes, 4; boolcodes: .long 0; .popsection");
-__asm__(".globl boolfnames; .pushsection .data; .type boolfnames, at object; .size boolfnames, 4; boolfnames: .long 0; .popsection");
-__asm__(".globl boolnames; .pushsection .data; .type boolnames, at object; .size boolnames, 4; boolnames: .long 0; .popsection");
-__asm__(".globl cur_term; .pushsection .data; .type cur_term, at object; .size cur_term, 4; cur_term: .long 0; .popsection");
-__asm__(".globl curscr; .pushsection .data; .type curscr, at object; .size curscr, 4; curscr: .long 0; .popsection");
-__asm__(".globl newscr; .pushsection .data; .type newscr, at object; .size newscr, 4; newscr: .long 0; .popsection");
-__asm__(".globl numcodes; .pushsection .data; .type numcodes, at object; .size numcodes, 4; numcodes: .long 0; .popsection");
-__asm__(".globl numfnames; .pushsection .data; .type numfnames, at object; .size numfnames, 4; numfnames: .long 0; .popsection");
-__asm__(".globl numnames; .pushsection .data; .type numnames, at object; .size numnames, 4; numnames: .long 0; .popsection");
-__asm__(".globl stdscr; .pushsection .data; .type stdscr, at object; .size stdscr, 4; stdscr: .long 0; .popsection");
-__asm__(".globl strcodes; .pushsection .data; .type strcodes, at object; .size strcodes, 4; strcodes: .long 0; .popsection");
-__asm__(".globl strfnames; .pushsection .data; .type strfnames, at object; .size strfnames, 4; strfnames: .long 0; .popsection");
-__asm__(".globl strnames; .pushsection .data; .type strnames, at object; .size strnames, 4; strnames: .long 0; .popsection");
+__asm__(".globl cur_term; .pushsection .data; .type cur_term, at object; .size cur_term, 8; cur_term: .long 0; .popsection");
+__asm__(".globl curscr; .pushsection .data; .type curscr, at object; .size curscr, 8; curscr: .long 0; .popsection");
+__asm__(".globl newscr; .pushsection .data; .type newscr, at object; .size newscr, 8; newscr: .long 0; .popsection");
+__asm__(".globl stdscr; .pushsection .data; .type stdscr, at object; .size stdscr, 8; stdscr: .long 0; .popsection");
 __asm__(".globl ttytype; .pushsection .data; .type ttytype, at object; .size ttytype, 4; ttytype: .long 0; .popsection");



More information about the lsb-messages mailing list