[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2124: ncursesw fixes to get rid of last compile time warnings (bug 1761)

[Mats Wichmann]

------------------------------------------------------------
revno: 2124
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Sat 2013-08-03 10:25:44 -0600
message:
  ncursesw fixes to get rid of last compile time warnings (bug 1761)
modified:
  headers/All/5.0/ncursesw/curses.h.defs
  headers/ncursesw/curses.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/All/5.0/ncursesw/curses.h.defs'
--- a/headers/All/5.0/ncursesw/curses.h.defs	2013-08-02 16:56:19 +0000
+++ b/headers/All/5.0/ncursesw/curses.h.defs	2013-08-03 16:25:44 +0000
@@ -23,12 +23,8 @@
 #define NCURSES_VERSION	"5.9"
 #define NCURSES_MOUSE_VERSION	1
 #define NCURSES_ENABLE_STDBOOL_H	1
-#define NCURSES_ATTR_T	int
 #define NCURSES_INLINE	inline
-#define NCURSES_COLOR_T	short
-#define NCURSES_SIZE_T	short
 #define NCURSES_TPARM_VARARGS	1
-#define NCURSES_CH_T	cchar_t
 #ifndef TRUE
 #define TRUE	1
 #endif
@@ -668,7 +664,6 @@
     cchar_t _bkgrnd;		/* current background char/attribute pair */
 };
 int (*_bkgrnd) (WINDOW *, int);
-struct ldat;
 extern int COLORS;
 extern int COLOR_PAIRS;
 extern int COLS;

=== modified file 'headers/ncursesw/curses.h'
--- a/headers/ncursesw/curses.h	2013-08-02 16:56:19 +0000
+++ b/headers/ncursesw/curses.h	2013-08-03 16:25:44 +0000
@@ -4,7 +4,7 @@
 
 #include <stdio.h>
 #include <wctype.h>
-#include <curses.h>
+/* #include <curses.h>		XXX hand-edit: bogus dependency */
 #include <stddef.h>
 #include <stdarg.h>
 #include <ncursesw/ncurses_dll.h>
@@ -38,12 +38,8 @@
 #define NCURSES_VERSION	"5.9"
 #define NCURSES_MOUSE_VERSION	1
 #define NCURSES_ENABLE_STDBOOL_H	1
-#define NCURSES_ATTR_T	int
 #define NCURSES_INLINE	inline
-#define NCURSES_COLOR_T	short
-#define NCURSES_SIZE_T	short
 #define NCURSES_TPARM_VARARGS	1
-#define NCURSES_CH_T	cchar_t
 #ifndef TRUE
 #define TRUE	1
 #endif
@@ -709,10 +705,10 @@
 	mmask_t bstate;
     } MEVENT;
 
+    struct ldat;
+
     int (*bstate) (WINDOW *, int);
 
-    struct ldat;
-
 
 /* Function prototypes */
 

=== modified file 'package/Makefile'
--- a/package/Makefile	2013-08-02 16:56:19 +0000
+++ b/package/Makefile	2013-08-03 16:25:44 +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=9
+RPM_PACKAGE_RELEASE=10
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)