[Lsb-messages] /var/www/bzr/lsb/devel/lsbspec r3916: pick up changes from patches in bug 1391, 1761, 3548

[Mats Wichmann]

------------------------------------------------------------
revno: 3916
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: lsbspec
timestamp: Fri 2013-07-26 14:20:02 -0600
message:
  pick up changes from patches in bug 1391, 1761, 3548
modified:
  LSB/generic/baselib/baselib.sgml
  LSB/generic/baselib/librt.sgml
  LSB/generic/utillib/libcursesw.sgml
  LSB/generic/utillib/utillib.sgml
-------------- next part --------------
=== modified file 'LSB/generic/baselib/baselib.sgml'
--- a/LSB/generic/baselib/baselib.sgml	2013-05-02 21:15:17 +0000
+++ b/LSB/generic/baselib/baselib.sgml	2013-07-26 20:20:02 +0000
@@ -38725,8 +38725,8 @@
     int __abs_prio;
     int __policy;
     int __error_code;
-    __ssize_t __return_value;
-    __off_t aio_offset;		/* File offset. */
+    ssize_t __return_value;
+    off_t aio_offset;		/* File offset. */
     char __pad[1];
     char __unused[1];
 };
@@ -38741,8 +38741,8 @@
     int __abs_prio;
     int __policy;
     int __error_code;
-    __ssize_t __return_value;
-    __off64_t aio_offset;
+    ssize_t __return_value;
+    off64_t aio_offset;
     char __unused[1];
 };
 extern int aio_cancel(int fildes, struct aiocb *aiocbp);

=== modified file 'LSB/generic/baselib/librt.sgml'
--- a/LSB/generic/baselib/librt.sgml	2013-03-21 14:16:16 +0000
+++ b/LSB/generic/baselib/librt.sgml	2013-07-26 20:20:02 +0000
@@ -282,8 +282,8 @@
     int __abs_prio;
     int __policy;
     int __error_code;
-    __ssize_t __return_value;
-    __off_t aio_offset;		/* File offset. */
+    ssize_t __return_value;
+    off_t aio_offset;		/* File offset. */
     char __pad[1];
     char __unused[1];
 };
@@ -298,8 +298,8 @@
     int __abs_prio;
     int __policy;
     int __error_code;
-    __ssize_t __return_value;
-    __off64_t aio_offset;
+    ssize_t __return_value;
+    off64_t aio_offset;
     char __unused[1];
 };
 extern int aio_cancel(int fildes, struct aiocb *aiocbp);

=== modified file 'LSB/generic/utillib/libcursesw.sgml'
--- a/LSB/generic/utillib/libcursesw.sgml	2013-03-06 23:53:06 +0000
+++ b/LSB/generic/utillib/libcursesw.sgml	2013-07-26 20:20:02 +0000
@@ -2333,7 +2333,7 @@
 #define strcodes	NCURSES_PUBLIC_VAR(strcodes())
 #define strfnames	NCURSES_PUBLIC_VAR(strfnames())
 
-typedef struct {
+typedef struct termtype {
     char *term_names;
     char *str_table;
     char *Booleans;
@@ -2347,23 +2347,20 @@
     unsigned short ext_Booleans;
     unsigned short ext_Numbers;
     unsigned short ext_Strings;
-} termtype;
-typedef termtype TERMTYPE;
-typedef struct {
+} TERMTYPE;
+typedef struct term {
     TERMTYPE type;
     short Filedes;
     struct termios Ottyb;
     struct termios Nttyb;
     int _baudrate;
     char *_termname;
-} term;
-typedef term TERMINAL;
-struct term;
-extern struct term *cur_term;
-extern int del_curterm(struct term *);
+} TERMINAL;
+extern TERMINAL *cur_term;
+extern int del_curterm(TERMINAL *);
 extern int putp(const char *);
 extern int restartterm(char *, int, int *);
-extern struct term *set_curterm(struct term *);
+extern TERMINAL *set_curterm(TERMINAL *);
 extern int setupterm(char *, int, int *);
 extern int tgetent(char *, const char *);
 extern int tgetflag(char *);

=== modified file 'LSB/generic/utillib/utillib.sgml'
--- a/LSB/generic/utillib/utillib.sgml	2013-03-20 16:45:53 +0000
+++ b/LSB/generic/utillib/utillib.sgml	2013-07-26 20:20:02 +0000
@@ -9222,7 +9222,7 @@
 #define strcodes	NCURSES_PUBLIC_VAR(strcodes())
 #define strfnames	NCURSES_PUBLIC_VAR(strfnames())
 
-typedef struct {
+typedef struct termtype {
     char *term_names;
     char *str_table;
     char *Booleans;
@@ -9236,23 +9236,20 @@
     unsigned short ext_Booleans;
     unsigned short ext_Numbers;
     unsigned short ext_Strings;
-} termtype;
-typedef termtype TERMTYPE;
-typedef struct {
+} TERMTYPE;
+typedef struct term {
     TERMTYPE type;
     short Filedes;
     struct termios Ottyb;
     struct termios Nttyb;
     int _baudrate;
     char *_termname;
-} term;
-typedef term TERMINAL;
-struct term;
-extern struct term *cur_term;
-extern int del_curterm(struct term *);
+} TERMINAL;
+extern TERMINAL *cur_term;
+extern int del_curterm(TERMINAL *);
 extern int putp(const char *);
 extern int restartterm(char *, int, int *);
-extern struct term *set_curterm(struct term *);
+extern TERMINAL *set_curterm(TERMINAL *);
 extern int setupterm(char *, int, int *);
 extern int tgetent(char *, const char *);
 extern int tgetflag(char *);