[Lsb-messages] /var/www/bzr/lsb/devel/lsbspec r3884: roll up various header (= data defs) tweaks
Mats Wichmann
mats at linuxfoundation.org
Tue Feb 5 13:34:45 UTC 2013
------------------------------------------------------------
revno: 3884
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: lsbspec
timestamp: Tue 2013-02-05 06:34:45 -0700
message:
roll up various header (= data defs) tweaks
modified:
LSB/generic/baselib/baselib.sgml
LSB/generic/baselib/libc.sgml
LSB/generic/utillib/libcursesw.sgml
LSB/generic/utillib/utillib.sgml
Toolkit_Gtk/generic/GTK/GTK.sgml
Toolkit_Gtk/generic/GTK/libGlib.sgml
Toolkit_Gtk/generic/GTK/libGobject.sgml
-------------- next part --------------
=== modified file 'LSB/generic/baselib/baselib.sgml'
--- a/LSB/generic/baselib/baselib.sgml 2013-01-02 18:29:42 +0000
+++ b/LSB/generic/baselib/baselib.sgml 2013-02-05 13:34:45 +0000
@@ -3903,12 +3903,21 @@
#define F_DUPFD 0
#define F_RDLCK 0
+#ifndef SEEK_SET
+#define SEEK_SET 0
+#endif
#define F_GETFD 1
#define F_WRLCK 1
+#ifndef SEEK_CUR
+#define SEEK_CUR 1
+#endif
#define F_SETSIG 10
#define F_GETSIG 11
#define F_SETFD 2
#define F_UNLCK 2
+#ifndef SEEK_END
+#define SEEK_END 2
+#endif
#define F_GETFL 3
#define F_SETFL 4
#define F_GETLK 5
@@ -6578,6 +6587,8 @@
#define si_fd _sifields._sigpoll._fd
#define si_timer1 _sifields._timer._timer1
#define si_timer2 _sifields._timer._timer2
+#define sigev_notify_attributes _sigev_un._sigev_thread._attribute
+#define sigev_notify_function _sigev_un._sigev_thread._function
typedef struct siginfo {
int si_signo; /* Signal number. */
@@ -6909,7 +6920,16 @@
#define EOF (-1)
#define P_tmpdir "/tmp"
+#ifndef SEEK_SET
+#define SEEK_SET 0
+#endif
+#ifndef SEEK_CUR
+#define SEEK_CUR 1
+#endif
#define FOPEN_MAX 16
+#ifndef SEEK_END
+#define SEEK_END 2
+#endif
#define L_tmpnam 20
#define TMP_MAX 238328
#define FILENAME_MAX 4096
@@ -7153,6 +7173,7 @@
extern size_t mbstowcs(wchar_t * __pwcs, const char *__s, size_t __n);
extern int mbtowc(wchar_t * __pwc, const char *__s, size_t __n);
extern char *mkdtemp(char *__template);
+extern int mkstemp(char *__template);
extern int mkstemp64(char *__template);
extern char *mktemp(char *__template);
extern long int mrand48(void);
@@ -7664,6 +7685,8 @@
extern int pselect(int __nfds, fd_set * __readfds, fd_set * __writefds,
fd_set * __exceptfds, const struct timespec *__timeout,
const sigset_t * __sigmask);
+extern int select(int __nfds, fd_set * __readfds, fd_set * __writefds,
+ fd_set * __exceptfds, struct timeval *__timeout);
</SCREEN>
</SECT2>
<SECT2>
@@ -8109,6 +8132,7 @@
typedef unsigned int uid_t;
typedef int pid_t;
typedef long int off_t;
+typedef long long int off64_t;
typedef int key_t;
typedef long int suseconds_t;
typedef unsigned int u_int;
@@ -8550,15 +8574,19 @@
</PARA>
<SCREEN>
+#ifndef SEEK_SET
#define SEEK_SET 0
+#endif
#define STDIN_FILENO 0
+#ifndef SEEK_CUR
#define SEEK_CUR 1
+#endif
#define STDOUT_FILENO 1
+#ifndef SEEK_END
#define SEEK_END 2
+#endif
#define STDERR_FILENO 2
-typedef long long int off64_t;
-
#define F_OK 0
#define X_OK 1
#define W_OK 2
@@ -8913,7 +8941,6 @@
extern int lockf64(int __fd, int __cmd, off64_t __len);
extern off_t lseek(int __fd, off_t __offset, int __whence);
extern loff_t lseek64(int __fd, loff_t __offset, int __whence);
-extern int mkstemp(char *__template);
extern int nice(int __inc);
extern char *optarg;
extern int opterr;
@@ -8937,8 +8964,6 @@
extern int rename(const char *__old, const char *__new);
extern int rmdir(const char *__path);
extern void *sbrk(intptr_t __delta);
-extern int select(int __nfds, fd_set * __readfds, fd_set * __writefds,
- fd_set * __exceptfds, struct timeval *__timeout);
extern int setegid(gid_t __gid);
extern int seteuid(uid_t __uid);
extern int setgid(gid_t __gid);
=== modified file 'LSB/generic/baselib/libc.sgml'
--- a/LSB/generic/baselib/libc.sgml 2012-11-09 14:53:51 +0000
+++ b/LSB/generic/baselib/libc.sgml 2013-02-05 13:34:45 +0000
@@ -3834,12 +3834,21 @@
#define F_DUPFD 0
#define F_RDLCK 0
+#ifndef SEEK_SET
+#define SEEK_SET 0
+#endif
#define F_GETFD 1
#define F_WRLCK 1
+#ifndef SEEK_CUR
+#define SEEK_CUR 1
+#endif
#define F_SETSIG 10
#define F_GETSIG 11
#define F_SETFD 2
#define F_UNLCK 2
+#ifndef SEEK_END
+#define SEEK_END 2
+#endif
#define F_GETFL 3
#define F_SETFL 4
#define F_GETLK 5
@@ -6509,6 +6518,8 @@
#define si_fd _sifields._sigpoll._fd
#define si_timer1 _sifields._timer._timer1
#define si_timer2 _sifields._timer._timer2
+#define sigev_notify_attributes _sigev_un._sigev_thread._attribute
+#define sigev_notify_function _sigev_un._sigev_thread._function
typedef struct siginfo {
int si_signo; /* Signal number. */
@@ -6840,7 +6851,16 @@
#define EOF (-1)
#define P_tmpdir "/tmp"
+#ifndef SEEK_SET
+#define SEEK_SET 0
+#endif
+#ifndef SEEK_CUR
+#define SEEK_CUR 1
+#endif
#define FOPEN_MAX 16
+#ifndef SEEK_END
+#define SEEK_END 2
+#endif
#define L_tmpnam 20
#define TMP_MAX 238328
#define FILENAME_MAX 4096
@@ -7084,6 +7104,7 @@
extern size_t mbstowcs(wchar_t * __pwcs, const char *__s, size_t __n);
extern int mbtowc(wchar_t * __pwc, const char *__s, size_t __n);
extern char *mkdtemp(char *__template);
+extern int mkstemp(char *__template);
extern int mkstemp64(char *__template);
extern char *mktemp(char *__template);
extern long int mrand48(void);
@@ -7595,6 +7616,8 @@
extern int pselect(int __nfds, fd_set * __readfds, fd_set * __writefds,
fd_set * __exceptfds, const struct timespec *__timeout,
const sigset_t * __sigmask);
+extern int select(int __nfds, fd_set * __readfds, fd_set * __writefds,
+ fd_set * __exceptfds, struct timeval *__timeout);
</SCREEN>
</SECT2>
<SECT2>
@@ -8040,6 +8063,7 @@
typedef unsigned int uid_t;
typedef int pid_t;
typedef long int off_t;
+typedef long long int off64_t;
typedef int key_t;
typedef long int suseconds_t;
typedef unsigned int u_int;
@@ -8481,15 +8505,19 @@
</PARA>
<SCREEN>
+#ifndef SEEK_SET
#define SEEK_SET 0
+#endif
#define STDIN_FILENO 0
+#ifndef SEEK_CUR
#define SEEK_CUR 1
+#endif
#define STDOUT_FILENO 1
+#ifndef SEEK_END
#define SEEK_END 2
+#endif
#define STDERR_FILENO 2
-typedef long long int off64_t;
-
#define F_OK 0
#define X_OK 1
#define W_OK 2
@@ -8844,7 +8872,6 @@
extern int lockf64(int __fd, int __cmd, off64_t __len);
extern off_t lseek(int __fd, off_t __offset, int __whence);
extern loff_t lseek64(int __fd, loff_t __offset, int __whence);
-extern int mkstemp(char *__template);
extern int nice(int __inc);
extern char *optarg;
extern int opterr;
@@ -8868,8 +8895,6 @@
extern int rename(const char *__old, const char *__new);
extern int rmdir(const char *__path);
extern void *sbrk(intptr_t __delta);
-extern int select(int __nfds, fd_set * __readfds, fd_set * __writefds,
- fd_set * __exceptfds, struct timeval *__timeout);
extern int setegid(gid_t __gid);
extern int seteuid(uid_t __uid);
extern int setgid(gid_t __gid);
=== modified file 'LSB/generic/utillib/libcursesw.sgml'
--- a/LSB/generic/utillib/libcursesw.sgml 2013-01-15 13:40:03 +0000
+++ b/LSB/generic/utillib/libcursesw.sgml 2013-02-05 13:34:45 +0000
@@ -586,7 +586,9 @@
#define NCURSES_SIZE_T short
#define NCURSES_TPARM_VARARGS 1
#define NCURSES_CH_T cchar_t
+#ifndef TRUE
#define TRUE 1
+#endif
#define NCURSES_BOOL bool
#ifdef __cplusplus
# define NCURSES_CAST(type,value) static_cast<type>(value)
=== modified file 'LSB/generic/utillib/utillib.sgml'
--- a/LSB/generic/utillib/utillib.sgml 2013-01-15 13:40:03 +0000
+++ b/LSB/generic/utillib/utillib.sgml 2013-02-05 13:34:45 +0000
@@ -7424,7 +7424,9 @@
#define NCURSES_SIZE_T short
#define NCURSES_TPARM_VARARGS 1
#define NCURSES_CH_T cchar_t
+#ifndef TRUE
#define TRUE 1
+#endif
#define NCURSES_BOOL bool
#ifdef __cplusplus
# define NCURSES_CAST(type,value) static_cast<type>(value)
=== modified file 'Toolkit_Gtk/generic/GTK/GTK.sgml'
--- a/Toolkit_Gtk/generic/GTK/GTK.sgml 2013-01-17 22:46:17 +0000
+++ b/Toolkit_Gtk/generic/GTK/GTK.sgml 2013-02-05 13:34:45 +0000
@@ -2826,14 +2826,6 @@
void *dummy_pointer;
long int dummy_long;
} GSystemThread;
-typedef struct _GStaticRecMutex {
- GStaticMutex mutex;
- guint depth;
- union {
- pthread_t owner;
- gdouble dummy;
- } unused;
-} GStaticRecMutex;
typedef struct _GMarkupParseContext GMarkupParseContext;
typedef struct _GData GData;
typedef enum {
@@ -3146,15 +3138,6 @@
} GUnicodeBreakType;
typedef struct _GStringChunk GStringChunk;
typedef struct _GCond GCond;
-typedef struct _GStaticRWLock {
- GStaticMutex mutex;
- GCond *read_cond;
- GCond *write_cond;
- guint read_counter;
- gboolean have_writer;
- guint want_to_read;
- guint want_to_write;
-} GStaticRWLock;
typedef void (*GChildWatchFunc) (GPid, gint, gpointer);
typedef struct _GTimeVal {
glong tv_sec;
@@ -3885,6 +3868,9 @@
};
typedef gint64 GTimeSpan;
typedef struct _GDateTime GDateTime;
+
+typedef struct _GStaticRecMutex GStaticRecMutex;
+typedef struct _GStaticRWLock GStaticRWLock;
extern void g_allocator_free(GAllocator * allocator);
extern GAllocator *g_allocator_new(const gchar * name, guint n_preallocs);
extern GArray *g_array_append_vals(GArray * array, gconstpointer data,
@@ -7700,14 +7686,10 @@
</PARA>
<SCREEN>
-#define TRACE(probe)
#define G_CLOSURE_NEEDS_MARSHAL(closure) \
(((GClosure*) (closure))->marshal == NULL)
#define G_TYPE_FROM_INTERFACE(g_iface) \
(((GTypeInterface*) (g_iface))->g_type)
-#define G_CLOSURE_N_NOTIFIERS(cl) \
- ((cl)->meta_marshal + ((cl)->n_guards << 1L) + (cl)->n_fnotifiers + \
- (cl)->n_inotifiers)
#define _G_TYPE_CCC(cp,gt,ct) \
((ct*) g_type_check_class_cast ((GTypeClass*) cp, gt))
#define _G_TYPE_CIC(ip,gt,ct) \
@@ -7990,23 +7972,23 @@
g_signal_handlers_unblock_matched ((instance), (GSignalMatchType) \
(G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA), 0, 0, NULL, (func), \
(data))
-#define G_DEFINE_TYPE_EXTENDED(TypeName,type_name,TYPE_PARENT,flags,CODE) \
- static void type_name ##_init (TypeName *self); static void type_name \
- ##_class_init (TypeName ##Class *klass); static gpointer type_name \
- ##_parent_class = NULL; static void type_name ##_class_intern_init \
- (gpointer klass) { type_name ##_parent_class = \
- g_type_class_peek_parent (klass); type_name ##_class_init ((TypeName \
- ##Class*) klass); } GType type_name ##_get_type (void) { static GType \
- g_define_type_id = 0; if (G_UNLIKELY (g_define_type_id == 0)) { static \
- const GTypeInfo g_define_type_info = { sizeof (TypeName ##Class), \
- (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) \
- type_name ##_class_intern_init, (GClassFinalizeFunc) NULL, NULL, \
- sizeof (TypeName), 0, (GInstanceInitFunc) type_name ##_init, NULL }; \
- g_define_type_id = g_type_register_static (TYPE_PARENT, #TypeName, \
- &g_define_type_info, (GTypeFlags) flags); { CODE ; } } return \
- g_define_type_id; }
#define G_CCLOSURE_SWAP_DATA(cclosure) \
(((GClosure*) (cclosure))->derivative_flag)
+#define G_OBJECT_WARN_INVALID_PSPEC(object,pname,property_id,pspec) \
+G_STMT_START { \
+ GObject *_object = (GObject*) (object); \
+ GParamSpec *_pspec = (GParamSpec*) (pspec); \
+ guint _property_id = (property_id); \
+ g_warning ("%s: invalid %s id %u for \"%s\" of type %s in %s", \
+ G_STRLOC, \
+ (pname), \
+ _property_id, \
+ _pspec->name, \
+ g_type_name (G_PARAM_SPEC_TYPE (_pspec)), \
+ G_OBJECT_TYPE_NAME (_object)); \
+} G_STMT_END
+#define G_CLOSURE_N_NOTIFIERS(cl) (((cl)->n_guards << 1L) + \
+ (cl)->n_fnotifiers + (cl)->n_inotifiers)
#define G_TYPE_FROM_CLASS(g_class) (((GTypeClass*) (g_class))->g_type)
#define G_VALUE_TYPE(value) (((GValue*) (value))->g_type)
#define _G_TYPE_IGC(ip,gt,ct) ((ct*) (((GTypeInstance*) ip)->g_class))
@@ -8154,19 +8136,6 @@
#define G_TYPE_UINT G_TYPE_MAKE_FUNDAMENTAL (7)
#define G_TYPE_LONG G_TYPE_MAKE_FUNDAMENTAL (8)
#define G_TYPE_ULONG G_TYPE_MAKE_FUNDAMENTAL (9)
-#define G_OBJECT_WARN_INVALID_PSPEC(object,pname,property_id,pspec) \
-G_STMT_START { \
- GObject *_object = (GObject*) (object); \
- GParamSpec *_pspec = (GParamSpec*) (pspec); \
- guint _property_id = (property_id); \
- g_warning ("%s: invalid %s id %u for "%s" of type %s in %s", \
- G_STRLOC, \
- (pname), \
- _property_id, \
- _pspec->name, \
- g_type_name (G_PARAM_SPEC_TYPE (_pspec)), \
- G_OBJECT_TYPE_NAME (_object)); \
-} G_STMT_END
#define G_DEFINE_DYNAMIC_TYPE_EXTENDED(TypeName,type_name,TYPE_PARENT,flags,CODE) \
static void type_name##_init (TypeName *self); \
static void type_name##_class_init (TypeName##Class *klass); \
=== modified file 'Toolkit_Gtk/generic/GTK/libGlib.sgml'
--- a/Toolkit_Gtk/generic/GTK/libGlib.sgml 2013-01-15 13:40:03 +0000
+++ b/Toolkit_Gtk/generic/GTK/libGlib.sgml 2013-02-05 13:34:45 +0000
@@ -2734,14 +2734,6 @@
void *dummy_pointer;
long int dummy_long;
} GSystemThread;
-typedef struct _GStaticRecMutex {
- GStaticMutex mutex;
- guint depth;
- union {
- pthread_t owner;
- gdouble dummy;
- } unused;
-} GStaticRecMutex;
typedef struct _GMarkupParseContext GMarkupParseContext;
typedef struct _GData GData;
typedef enum {
@@ -3054,15 +3046,6 @@
} GUnicodeBreakType;
typedef struct _GStringChunk GStringChunk;
typedef struct _GCond GCond;
-typedef struct _GStaticRWLock {
- GStaticMutex mutex;
- GCond *read_cond;
- GCond *write_cond;
- guint read_counter;
- gboolean have_writer;
- guint want_to_read;
- guint want_to_write;
-} GStaticRWLock;
typedef void (*GChildWatchFunc) (GPid, gint, gpointer);
typedef struct _GTimeVal {
glong tv_sec;
@@ -3793,6 +3776,9 @@
};
typedef gint64 GTimeSpan;
typedef struct _GDateTime GDateTime;
+
+typedef struct _GStaticRecMutex GStaticRecMutex;
+typedef struct _GStaticRWLock GStaticRWLock;
extern void g_allocator_free(GAllocator * allocator);
extern GAllocator *g_allocator_new(const gchar * name, guint n_preallocs);
extern GArray *g_array_append_vals(GArray * array, gconstpointer data,
=== modified file 'Toolkit_Gtk/generic/GTK/libGobject.sgml'
--- a/Toolkit_Gtk/generic/GTK/libGobject.sgml 2013-01-15 15:01:52 +0000
+++ b/Toolkit_Gtk/generic/GTK/libGobject.sgml 2013-02-05 13:34:45 +0000
@@ -1240,14 +1240,10 @@
</PARA>
<SCREEN>
-#define TRACE(probe)
#define G_CLOSURE_NEEDS_MARSHAL(closure) \
(((GClosure*) (closure))->marshal == NULL)
#define G_TYPE_FROM_INTERFACE(g_iface) \
(((GTypeInterface*) (g_iface))->g_type)
-#define G_CLOSURE_N_NOTIFIERS(cl) \
- ((cl)->meta_marshal + ((cl)->n_guards << 1L) + (cl)->n_fnotifiers + \
- (cl)->n_inotifiers)
#define _G_TYPE_CCC(cp,gt,ct) \
((ct*) g_type_check_class_cast ((GTypeClass*) cp, gt))
#define _G_TYPE_CIC(ip,gt,ct) \
@@ -1530,23 +1526,23 @@
g_signal_handlers_unblock_matched ((instance), (GSignalMatchType) \
(G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA), 0, 0, NULL, (func), \
(data))
-#define G_DEFINE_TYPE_EXTENDED(TypeName,type_name,TYPE_PARENT,flags,CODE) \
- static void type_name ##_init (TypeName *self); static void type_name \
- ##_class_init (TypeName ##Class *klass); static gpointer type_name \
- ##_parent_class = NULL; static void type_name ##_class_intern_init \
- (gpointer klass) { type_name ##_parent_class = \
- g_type_class_peek_parent (klass); type_name ##_class_init ((TypeName \
- ##Class*) klass); } GType type_name ##_get_type (void) { static GType \
- g_define_type_id = 0; if (G_UNLIKELY (g_define_type_id == 0)) { static \
- const GTypeInfo g_define_type_info = { sizeof (TypeName ##Class), \
- (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) \
- type_name ##_class_intern_init, (GClassFinalizeFunc) NULL, NULL, \
- sizeof (TypeName), 0, (GInstanceInitFunc) type_name ##_init, NULL }; \
- g_define_type_id = g_type_register_static (TYPE_PARENT, #TypeName, \
- &g_define_type_info, (GTypeFlags) flags); { CODE ; } } return \
- g_define_type_id; }
#define G_CCLOSURE_SWAP_DATA(cclosure) \
(((GClosure*) (cclosure))->derivative_flag)
+#define G_OBJECT_WARN_INVALID_PSPEC(object,pname,property_id,pspec) \
+G_STMT_START { \
+ GObject *_object = (GObject*) (object); \
+ GParamSpec *_pspec = (GParamSpec*) (pspec); \
+ guint _property_id = (property_id); \
+ g_warning ("%s: invalid %s id %u for \"%s\" of type `%s' in `%s'", \
+ G_STRLOC, \
+ (pname), \
+ _property_id, \
+ _pspec->name, \
+ g_type_name (G_PARAM_SPEC_TYPE (_pspec)), \
+ G_OBJECT_TYPE_NAME (_object)); \
+} G_STMT_END
+#define G_CLOSURE_N_NOTIFIERS(cl) (((cl)->n_guards << 1L) + \
+ (cl)->n_fnotifiers + (cl)->n_inotifiers)
#define G_TYPE_FROM_CLASS(g_class) (((GTypeClass*) (g_class))->g_type)
#define G_VALUE_TYPE(value) (((GValue*) (value))->g_type)
#define _G_TYPE_IGC(ip,gt,ct) ((ct*) (((GTypeInstance*) ip)->g_class))
@@ -1694,19 +1690,6 @@
#define G_TYPE_UINT G_TYPE_MAKE_FUNDAMENTAL (7)
#define G_TYPE_LONG G_TYPE_MAKE_FUNDAMENTAL (8)
#define G_TYPE_ULONG G_TYPE_MAKE_FUNDAMENTAL (9)
-#define G_OBJECT_WARN_INVALID_PSPEC(object,pname,property_id,pspec) \
-G_STMT_START { \
- GObject *_object = (GObject*) (object); \
- GParamSpec *_pspec = (GParamSpec*) (pspec); \
- guint _property_id = (property_id); \
- g_warning ("%s: invalid %s id %u for "%s" of type `%s' in `%s'", \
- G_STRLOC, \
- (pname), \
- _property_id, \
- _pspec->name, \
- g_type_name (G_PARAM_SPEC_TYPE (_pspec)), \
- G_OBJECT_TYPE_NAME (_object)); \
-} G_STMT_END
#define G_DEFINE_DYNAMIC_TYPE_EXTENDED(TypeName,type_name,TYPE_PARENT,flags,CODE) \
static void type_name##_init (TypeName *self); \
static void type_name##_class_init (TypeName##Class *klass); \
More information about the lsb-messages
mailing list