update glib to 2.68.3
This commit is contained in:
alexey.lysiuk
parent
d1764b0b00
commit
42e719e578
|
|
@ -22,7 +22,7 @@ import os
|
|||
import re
|
||||
import sys
|
||||
|
||||
VERSION_STR = '''glib-genmarshal version 2.66.4
|
||||
VERSION_STR = '''glib-genmarshal version 2.68.3
|
||||
glib-genmarshal comes with ABSOLUTELY NO WARRANTY.
|
||||
You may redistribute copies of glib-genmarshal under the terms of
|
||||
the GNU General Public License which can be found in the
|
||||
|
|
@ -864,7 +864,7 @@ def generate_marshallers_body(outfile, retval, params,
|
|||
outfile.write('\n\n')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
def parse_args():
|
||||
arg_parser = argparse.ArgumentParser(description='Generate signal marshallers for GObject')
|
||||
arg_parser.add_argument('--prefix', metavar='STRING',
|
||||
default='g_cclosure_user_marshal',
|
||||
|
|
@ -945,6 +945,10 @@ if __name__ == '__main__':
|
|||
print(VERSION_STR)
|
||||
sys.exit(0)
|
||||
|
||||
return args
|
||||
|
||||
|
||||
def generate(args):
|
||||
# Backward compatibility hack; some projects use both arguments to
|
||||
# generate the marshallers prototype in the C source, even though
|
||||
# it's not really a supported use case. We keep this behaviour by
|
||||
|
|
@ -1067,3 +1071,10 @@ if __name__ == '__main__':
|
|||
|
||||
if args.header:
|
||||
generate_header_postamble(args.output, prefix=args.prefix, use_pragma=args.pragma_once)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
args = parse_args()
|
||||
|
||||
with args.output:
|
||||
generate(args)
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ import errno
|
|||
import codecs
|
||||
import locale
|
||||
|
||||
VERSION_STR = '''glib-mkenums version 2.66.4
|
||||
VERSION_STR = '''glib-mkenums version 2.68.3
|
||||
glib-mkenums comes with ABSOLUTELY NO WARRANTY.
|
||||
You may redistribute copies of glib-mkenums under the terms of
|
||||
the GNU General Public License which can be found in the
|
||||
|
|
@ -131,17 +131,18 @@ option_lowercase_name = '' # DEPRECATED. A lower case name to use as part
|
|||
# uses abnormal capitalization and we can not
|
||||
# guess where to put the underscores.
|
||||
option_since = '' # User provided version info for the enum.
|
||||
seenbitshift = 0 # Have we seen bitshift operators?
|
||||
enum_prefix = None # Prefix for this enumeration
|
||||
enumname = '' # Name for this enumeration
|
||||
enumshort = '' # $enumname without prefix
|
||||
enumname_prefix = '' # prefix of $enumname
|
||||
enumindex = 0 # Global enum counter
|
||||
firstenum = 1 # Is this the first enumeration per file?
|
||||
entries = [] # [ name, val ] for each entry
|
||||
sandbox = None # sandbox for safe evaluation of expressions
|
||||
seenbitshift = 0 # Have we seen bitshift operators?
|
||||
seenprivate = False # Have we seen a private option?
|
||||
enum_prefix = None # Prefix for this enumeration
|
||||
enumname = '' # Name for this enumeration
|
||||
enumshort = '' # $enumname without prefix
|
||||
enumname_prefix = '' # prefix of $enumname
|
||||
enumindex = 0 # Global enum counter
|
||||
firstenum = 1 # Is this the first enumeration per file?
|
||||
entries = [] # [ name, val ] for each entry
|
||||
sandbox = None # sandbox for safe evaluation of expressions
|
||||
|
||||
output = '' # Filename to write result into
|
||||
output = '' # Filename to write result into
|
||||
|
||||
def parse_trigraph(opts):
|
||||
result = {}
|
||||
|
|
@ -161,7 +162,7 @@ def parse_trigraph(opts):
|
|||
return result
|
||||
|
||||
def parse_entries(file, file_name):
|
||||
global entries, enumindex, enumname, seenbitshift, flags
|
||||
global entries, enumindex, enumname, seenbitshift, seenprivate, flags
|
||||
looking_for_name = False
|
||||
|
||||
while True:
|
||||
|
|
@ -218,6 +219,7 @@ def parse_entries(file, file_name):
|
|||
|
||||
m = re.match(r'''\s*
|
||||
(\w+)\s* # name
|
||||
(\s+[A-Z]+_(?:AVAILABLE|DEPRECATED)_ENUMERATOR_IN_[0-9_]+(?:_FOR\s*\(\s*\w+\s*\))?\s*)? # availability
|
||||
(?:=( # value
|
||||
\s*\w+\s*\(.*\)\s* # macro with multiple args
|
||||
| # OR
|
||||
|
|
@ -230,25 +232,45 @@ def parse_entries(file, file_name):
|
|||
if m:
|
||||
groups = m.groups()
|
||||
name = groups[0]
|
||||
availability = None
|
||||
value = None
|
||||
options = None
|
||||
if len(groups) > 1:
|
||||
value = groups[1]
|
||||
availability = groups[1]
|
||||
if len(groups) > 2:
|
||||
options = groups[2]
|
||||
value = groups[2]
|
||||
if len(groups) > 3:
|
||||
options = groups[3]
|
||||
if flags is None and value is not None and '<<' in value:
|
||||
seenbitshift = 1
|
||||
|
||||
if seenprivate:
|
||||
continue
|
||||
|
||||
if options is not None:
|
||||
options = parse_trigraph(options)
|
||||
if 'skip' not in options:
|
||||
entries.append((name, value, options.get('nick')))
|
||||
else:
|
||||
entries.append((name, value))
|
||||
elif re.match(r's*\#', line):
|
||||
pass
|
||||
else:
|
||||
print_warning('Failed to parse "{}" in {}'.format(line, file_name))
|
||||
m = re.match(r'''\s*
|
||||
/\*< (([^*]|\*(?!/))*) >\s*\*/
|
||||
\s*$''', line, flags=re.X)
|
||||
if m:
|
||||
options = m.groups()[0]
|
||||
if options is not None:
|
||||
options = parse_trigraph(options)
|
||||
if 'private' in options:
|
||||
seenprivate = True
|
||||
continue
|
||||
if 'public' in options:
|
||||
seenprivate = False
|
||||
continue
|
||||
if re.match(r's*\#', line):
|
||||
pass
|
||||
else:
|
||||
print_warning('Failed to parse "{}" in {}'.format(line, file_name))
|
||||
return False
|
||||
|
||||
help_epilog = '''Production text substitutions:
|
||||
|
|
@ -464,7 +486,7 @@ if len(fhead) > 0:
|
|||
write_output(prod)
|
||||
|
||||
def process_file(curfilename):
|
||||
global entries, flags, seenbitshift, enum_prefix
|
||||
global entries, flags, seenbitshift, seenprivate, enum_prefix
|
||||
firstenum = True
|
||||
|
||||
try:
|
||||
|
|
@ -542,6 +564,7 @@ def process_file(curfilename):
|
|||
break
|
||||
|
||||
seenbitshift = 0
|
||||
seenprivate = False
|
||||
entries = []
|
||||
|
||||
# Now parse the entries
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@
|
|||
#include <glib/gstrfuncs.h>
|
||||
#include <glib/gstringchunk.h>
|
||||
#include <glib/gstring.h>
|
||||
#include <glib/gstrvbuilder.h>
|
||||
#include <glib/gtestutils.h>
|
||||
#include <glib/gthread.h>
|
||||
#include <glib/gthreadpool.h>
|
||||
|
|
|
|||
|
|
@ -26,6 +26,11 @@
|
|||
|
||||
#include <glib/gtypes.h>
|
||||
|
||||
#if defined(glib_typeof_2_68) && GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68
|
||||
/* for glib_typeof */
|
||||
#include <type_traits>
|
||||
#endif
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
|
|
@ -103,24 +108,24 @@ G_END_DECLS
|
|||
__atomic_store ((gint *)(atomic), &gais_temp, __ATOMIC_SEQ_CST); \
|
||||
}))
|
||||
|
||||
#if defined(g_has_typeof)
|
||||
#define g_atomic_pointer_get(atomic) \
|
||||
(G_GNUC_EXTENSION ({ \
|
||||
G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
|
||||
__typeof__(*(atomic)) gapg_temp_newval; \
|
||||
__typeof__((atomic)) gapg_temp_atomic = (atomic); \
|
||||
__atomic_load (gapg_temp_atomic, &gapg_temp_newval, __ATOMIC_SEQ_CST); \
|
||||
gapg_temp_newval; \
|
||||
#if defined(glib_typeof) && (!defined(glib_typeof_2_68) || GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68)
|
||||
#define g_atomic_pointer_get(atomic) \
|
||||
(G_GNUC_EXTENSION ({ \
|
||||
G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
|
||||
glib_typeof (*(atomic)) gapg_temp_newval; \
|
||||
glib_typeof ((atomic)) gapg_temp_atomic = (atomic); \
|
||||
__atomic_load (gapg_temp_atomic, &gapg_temp_newval, __ATOMIC_SEQ_CST); \
|
||||
gapg_temp_newval; \
|
||||
}))
|
||||
#define g_atomic_pointer_set(atomic, newval) \
|
||||
(G_GNUC_EXTENSION ({ \
|
||||
G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
|
||||
__typeof__((atomic)) gaps_temp_atomic = (atomic); \
|
||||
__typeof__(*(atomic)) gaps_temp_newval = (newval); \
|
||||
(void) (0 ? (gpointer) *(atomic) : NULL); \
|
||||
__atomic_store (gaps_temp_atomic, &gaps_temp_newval, __ATOMIC_SEQ_CST); \
|
||||
#define g_atomic_pointer_set(atomic, newval) \
|
||||
(G_GNUC_EXTENSION ({ \
|
||||
G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
|
||||
glib_typeof ((atomic)) gaps_temp_atomic = (atomic); \
|
||||
glib_typeof (*(atomic)) gaps_temp_newval = (newval); \
|
||||
(void) (0 ? (gpointer) * (atomic) : NULL); \
|
||||
__atomic_store (gaps_temp_atomic, &gaps_temp_newval, __ATOMIC_SEQ_CST); \
|
||||
}))
|
||||
#else /* if !defined(g_has_typeof) */
|
||||
#else /* if !(defined(glib_typeof) && (!defined(glib_typeof_2_68) || GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68)) */
|
||||
#define g_atomic_pointer_get(atomic) \
|
||||
(G_GNUC_EXTENSION ({ \
|
||||
G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
|
||||
|
|
@ -137,7 +142,7 @@ G_END_DECLS
|
|||
(void) (0 ? (gpointer) *(atomic) : NULL); \
|
||||
__atomic_store (gaps_temp_atomic, &gaps_temp_newval, __ATOMIC_SEQ_CST); \
|
||||
}))
|
||||
#endif /* !defined(g_has_typeof) */
|
||||
#endif /* if defined(glib_typeof) && (!defined(glib_typeof_2_68) || GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68) */
|
||||
|
||||
#define g_atomic_int_inc(atomic) \
|
||||
(G_GNUC_EXTENSION ({ \
|
||||
|
|
@ -183,14 +188,33 @@ G_END_DECLS
|
|||
(guint) __atomic_fetch_xor ((atomic), (val), __ATOMIC_SEQ_CST); \
|
||||
}))
|
||||
|
||||
#if defined(glib_typeof) && defined(__cplusplus) && __cplusplus >= 201103L
|
||||
/* This is typesafe because we check we can assign oldval to the type of
|
||||
* (*atomic). Unfortunately it can only be done in C++ because gcc/clang warn
|
||||
* when atomic is volatile and not oldval, or when atomic is gsize* and oldval
|
||||
* is NULL. Note that clang++ force us to be typesafe because it is an error if the 2nd
|
||||
* argument of __atomic_compare_exchange_n() has a different type than the
|
||||
* first.
|
||||
* https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1919
|
||||
* https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1715#note_1024120. */
|
||||
#define g_atomic_pointer_compare_and_exchange(atomic, oldval, newval) \
|
||||
(G_GNUC_EXTENSION ({ \
|
||||
G_STATIC_ASSERT (sizeof (oldval) == sizeof (gpointer)); \
|
||||
__typeof__ ((oldval)) gapcae_oldval = (oldval); \
|
||||
glib_typeof (*(atomic)) gapcae_oldval = (oldval); \
|
||||
G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
|
||||
(void) (0 ? (gpointer) *(atomic) : NULL); \
|
||||
__atomic_compare_exchange_n ((atomic), &gapcae_oldval, (newval), FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ? TRUE : FALSE; \
|
||||
}))
|
||||
#else /* if !(defined(glib_typeof) && defined(__cplusplus) && __cplusplus >= 201103L) */
|
||||
#define g_atomic_pointer_compare_and_exchange(atomic, oldval, newval) \
|
||||
(G_GNUC_EXTENSION ({ \
|
||||
G_STATIC_ASSERT (sizeof (oldval) == sizeof (gpointer)); \
|
||||
gpointer gapcae_oldval = (gpointer)(oldval); \
|
||||
G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
|
||||
(void) (0 ? (gpointer) *(atomic) : NULL); \
|
||||
__atomic_compare_exchange_n ((atomic), &gapcae_oldval, (newval), FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ? TRUE : FALSE; \
|
||||
}))
|
||||
#endif /* defined(glib_typeof) */
|
||||
#define g_atomic_pointer_add(atomic, val) \
|
||||
(G_GNUC_EXTENSION ({ \
|
||||
G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
|
||||
|
|
@ -200,7 +224,7 @@ G_END_DECLS
|
|||
}))
|
||||
#define g_atomic_pointer_and(atomic, val) \
|
||||
(G_GNUC_EXTENSION ({ \
|
||||
volatile gsize *gapa_atomic = (volatile gsize *) (atomic); \
|
||||
gsize *gapa_atomic = (gsize *) (atomic); \
|
||||
G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
|
||||
G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gsize)); \
|
||||
(void) (0 ? (gpointer) *(atomic) : NULL); \
|
||||
|
|
@ -209,7 +233,7 @@ G_END_DECLS
|
|||
}))
|
||||
#define g_atomic_pointer_or(atomic, val) \
|
||||
(G_GNUC_EXTENSION ({ \
|
||||
volatile gsize *gapo_atomic = (volatile gsize *) (atomic); \
|
||||
gsize *gapo_atomic = (gsize *) (atomic); \
|
||||
G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
|
||||
G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gsize)); \
|
||||
(void) (0 ? (gpointer) *(atomic) : NULL); \
|
||||
|
|
@ -218,7 +242,7 @@ G_END_DECLS
|
|||
}))
|
||||
#define g_atomic_pointer_xor(atomic, val) \
|
||||
(G_GNUC_EXTENSION ({ \
|
||||
volatile gsize *gapx_atomic = (volatile gsize *) (atomic); \
|
||||
gsize *gapx_atomic = (gsize *) (atomic); \
|
||||
G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
|
||||
G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gsize)); \
|
||||
(void) (0 ? (gpointer) *(atomic) : NULL); \
|
||||
|
|
@ -283,14 +307,25 @@ G_END_DECLS
|
|||
__asm__ __volatile__ ("" : : : "memory"); \
|
||||
gapg_result; \
|
||||
}))
|
||||
#if defined(glib_typeof) && (!defined(glib_typeof_2_68) || GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68)
|
||||
#define g_atomic_pointer_set(atomic, newval) \
|
||||
(G_GNUC_EXTENSION ({ \
|
||||
G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
|
||||
(void) (0 ? (gpointer) *(atomic) : NULL); \
|
||||
__sync_synchronize (); \
|
||||
__asm__ __volatile__ ("" : : : "memory"); \
|
||||
*(atomic) = (__typeof__ (*(atomic))) (gsize) (newval); \
|
||||
*(atomic) = (glib_typeof (*(atomic))) (gsize) (newval); \
|
||||
}))
|
||||
#else /* if !(defined(glib_typeof) && (!defined(glib_typeof_2_68) || GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68)) */
|
||||
#define g_atomic_pointer_set(atomic, newval) \
|
||||
(G_GNUC_EXTENSION ({ \
|
||||
G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
|
||||
(void) (0 ? (gpointer) *(atomic) : NULL); \
|
||||
__sync_synchronize (); \
|
||||
__asm__ __volatile__ ("" : : : "memory"); \
|
||||
*(atomic) = (gpointer) (gsize) (newval); \
|
||||
}))
|
||||
#endif /* if defined(glib_typeof) && (!defined(glib_typeof_2_68) || GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68) */
|
||||
|
||||
#define g_atomic_int_inc(atomic) \
|
||||
(G_GNUC_EXTENSION ({ \
|
||||
|
|
@ -393,10 +428,24 @@ G_END_DECLS
|
|||
#define g_atomic_int_dec_and_test(atomic) \
|
||||
(g_atomic_int_dec_and_test ((gint *) (atomic)))
|
||||
|
||||
#if defined(glib_typeof) && (!defined(glib_typeof_2_68) || GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68)
|
||||
/* The (void *) cast in the middle *looks* redundant, because
|
||||
* g_atomic_pointer_get returns void * already, but it's to silence
|
||||
* -Werror=bad-function-cast when we're doing something like:
|
||||
* guintptr a, b; ...; a = g_atomic_pointer_get (&b);
|
||||
* which would otherwise be assigning the void * result of
|
||||
* g_atomic_pointer_get directly to the pointer-sized but
|
||||
* non-pointer-typed result. */
|
||||
#define g_atomic_pointer_get(atomic) \
|
||||
(glib_typeof (*(atomic))) (void *) ((g_atomic_pointer_get) ((void *) atomic))
|
||||
#else /* !(defined(glib_typeof) && (!defined(glib_typeof_2_68) || GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68)) */
|
||||
#define g_atomic_pointer_get(atomic) \
|
||||
(g_atomic_pointer_get (atomic))
|
||||
#endif
|
||||
|
||||
#define g_atomic_pointer_set(atomic, newval) \
|
||||
(g_atomic_pointer_set ((atomic), (gpointer) (newval)))
|
||||
|
||||
#define g_atomic_pointer_compare_and_exchange(atomic, oldval, newval) \
|
||||
(g_atomic_pointer_compare_and_exchange ((atomic), (gpointer) (oldval), (gpointer) (newval)))
|
||||
#define g_atomic_pointer_add(atomic, val) \
|
||||
|
|
@ -408,6 +457,6 @@ G_END_DECLS
|
|||
#define g_atomic_pointer_xor(atomic, val) \
|
||||
(g_atomic_pointer_xor ((atomic), (gsize) (val)))
|
||||
|
||||
#endif /* defined(__GNUC__) && defined(G_ATOMIC_OP_USE_GCC_BUILTINS) */
|
||||
#endif /* defined(G_ATOMIC_LOCK_FREE) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) */
|
||||
|
||||
#endif /* __G_ATOMIC_H__ */
|
||||
|
|
|
|||
|
|
@ -47,6 +47,145 @@ struct _GError
|
|||
gchar *message;
|
||||
};
|
||||
|
||||
/**
|
||||
* G_DEFINE_EXTENDED_ERROR:
|
||||
* @ErrorType: name to return a #GQuark for
|
||||
* @error_type: prefix for the function name
|
||||
*
|
||||
* A convenience macro which defines two functions. First, returning
|
||||
* the #GQuark for the extended error type @ErrorType; it is called
|
||||
* `error_type_quark()`. Second, returning the private data from a
|
||||
* passed #GError; it is called `error_type_get_private()`.
|
||||
*
|
||||
* For this macro to work, a type named `ErrorTypePrivate` should be
|
||||
* defined, `error_type_private_init()`, `error_type_private_copy()`
|
||||
* and `error_type_private_clear()` functions need to be either
|
||||
* declared or defined. The functions should be similar to
|
||||
* #GErrorInitFunc, #GErrorCopyFunc and #GErrorClearFunc,
|
||||
* respectively, but they should receive the private data type instead
|
||||
* of #GError.
|
||||
*
|
||||
* See [Extended #GError Domains][gerror-extended-domains] for an example.
|
||||
*
|
||||
* Since: 2.68
|
||||
*/
|
||||
#define G_DEFINE_EXTENDED_ERROR(ErrorType, error_type) \
|
||||
static inline ErrorType ## Private * \
|
||||
error_type ## _get_private (const GError *error) \
|
||||
{ \
|
||||
/* Copied from gtype.c (STRUCT_ALIGNMENT and ALIGN_STRUCT macros). */ \
|
||||
const gsize sa = 2 * sizeof (gsize); \
|
||||
const gsize as = (sizeof (ErrorType ## Private) + (sa - 1)) & -sa; \
|
||||
g_return_val_if_fail (error != NULL, NULL); \
|
||||
g_return_val_if_fail (error->domain == error_type ## _quark (), NULL); \
|
||||
return (ErrorType ## Private *) (((guint8 *)error) - as); \
|
||||
} \
|
||||
\
|
||||
static void \
|
||||
g_error_with_ ## error_type ## _private_init (GError *error) \
|
||||
{ \
|
||||
ErrorType ## Private *priv = error_type ## _get_private (error); \
|
||||
error_type ## _private_init (priv); \
|
||||
} \
|
||||
\
|
||||
static void \
|
||||
g_error_with_ ## error_type ## _private_copy (const GError *src_error, \
|
||||
GError *dest_error) \
|
||||
{ \
|
||||
const ErrorType ## Private *src_priv = error_type ## _get_private (src_error); \
|
||||
ErrorType ## Private *dest_priv = error_type ## _get_private (dest_error); \
|
||||
error_type ## _private_copy (src_priv, dest_priv); \
|
||||
} \
|
||||
\
|
||||
static void \
|
||||
g_error_with_ ## error_type ## _private_clear (GError *error) \
|
||||
{ \
|
||||
ErrorType ## Private *priv = error_type ## _get_private (error); \
|
||||
error_type ## _private_clear (priv); \
|
||||
} \
|
||||
\
|
||||
GQuark \
|
||||
error_type ## _quark (void) \
|
||||
{ \
|
||||
static GQuark q; \
|
||||
static gsize initialized = 0; \
|
||||
\
|
||||
if (g_once_init_enter (&initialized)) \
|
||||
{ \
|
||||
q = g_error_domain_register_static (#ErrorType, \
|
||||
sizeof (ErrorType ## Private), \
|
||||
g_error_with_ ## error_type ## _private_init, \
|
||||
g_error_with_ ## error_type ## _private_copy, \
|
||||
g_error_with_ ## error_type ## _private_clear); \
|
||||
g_once_init_leave (&initialized, 1); \
|
||||
} \
|
||||
\
|
||||
return q; \
|
||||
}
|
||||
|
||||
/**
|
||||
* GErrorInitFunc:
|
||||
* @error: extended error
|
||||
*
|
||||
* Specifies the type of function which is called just after an
|
||||
* extended error instance is created and its fields filled. It should
|
||||
* only initialize the fields in the private data, which can be
|
||||
* received with the generated `*_get_private()` function.
|
||||
*
|
||||
* Normally, it is better to use G_DEFINE_EXTENDED_ERROR(), as it
|
||||
* already takes care of getting the private data from @error.
|
||||
*
|
||||
* Since: 2.68
|
||||
*/
|
||||
typedef void (*GErrorInitFunc) (GError *error);
|
||||
|
||||
/**
|
||||
* GErrorCopyFunc:
|
||||
* @src_error: source extended error
|
||||
* @dest_error: destination extended error
|
||||
*
|
||||
* Specifies the type of function which is called when an extended
|
||||
* error instance is copied. It is passed the pointer to the
|
||||
* destination error and source error, and should copy only the fields
|
||||
* of the private data from @src_error to @dest_error.
|
||||
*
|
||||
* Normally, it is better to use G_DEFINE_EXTENDED_ERROR(), as it
|
||||
* already takes care of getting the private data from @src_error and
|
||||
* @dest_error.
|
||||
*
|
||||
* Since: 2.68
|
||||
*/
|
||||
typedef void (*GErrorCopyFunc) (const GError *src_error, GError *dest_error);
|
||||
|
||||
/**
|
||||
* GErrorClearFunc:
|
||||
* @error: extended error to clear
|
||||
*
|
||||
* Specifies the type of function which is called when an extended
|
||||
* error instance is freed. It is passed the error pointer about to be
|
||||
* freed, and should free the error's private data fields.
|
||||
*
|
||||
* Normally, it is better to use G_DEFINE_EXTENDED_ERROR(), as it
|
||||
* already takes care of getting the private data from @error.
|
||||
*
|
||||
* Since: 2.68
|
||||
*/
|
||||
typedef void (*GErrorClearFunc) (GError *error);
|
||||
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
GQuark g_error_domain_register_static (const char *error_type_name,
|
||||
gsize error_type_private_size,
|
||||
GErrorInitFunc error_type_init,
|
||||
GErrorCopyFunc error_type_copy,
|
||||
GErrorClearFunc error_type_clear);
|
||||
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
GQuark g_error_domain_register (const char *error_type_name,
|
||||
gsize error_type_private_size,
|
||||
GErrorInitFunc error_type_init,
|
||||
GErrorCopyFunc error_type_copy,
|
||||
GErrorClearFunc error_type_clear);
|
||||
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
GError* g_error_new (GQuark domain,
|
||||
gint code,
|
||||
|
|
|
|||
|
|
@ -78,6 +78,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GSequence, g_sequence_free)
|
|||
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GSList, g_slist_free)
|
||||
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GString, g_autoptr_cleanup_gstring_free)
|
||||
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GStringChunk, g_string_chunk_free)
|
||||
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GStrvBuilder, g_strv_builder_unref)
|
||||
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GThread, g_thread_unref)
|
||||
G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GMutex, g_mutex_clear)
|
||||
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GMutexLocker, g_mutex_locker_free)
|
||||
|
|
|
|||
|
|
@ -231,9 +231,21 @@
|
|||
*
|
||||
* This symbol is private.
|
||||
*/
|
||||
#undef g_has_typeof
|
||||
#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) && !defined(__cplusplus)
|
||||
#define g_has_typeof
|
||||
#undef glib_typeof
|
||||
#if !defined(__cplusplus) && \
|
||||
((defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))) || \
|
||||
defined(__clang__))
|
||||
#define glib_typeof(t) __typeof__ (t)
|
||||
#elif defined(__cplusplus) && __cplusplus >= 201103L
|
||||
/* C++11 decltype() is close enough for our usage */
|
||||
/* This needs `#include <type_traits>`, but we have guarded this feature with a
|
||||
* `GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68` check, and such a check
|
||||
* cannot be enforced in this header due to include ordering requirements.
|
||||
* Within GLib itself, which use `glib_typeof` need to add the include
|
||||
* themselves. See other examples in GLib for how to do this.
|
||||
*/
|
||||
#define glib_typeof(t) typename std::remove_reference<decltype (t)>::type
|
||||
#define glib_typeof_2_68
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
@ -421,6 +433,12 @@
|
|||
* It is used for declaring functions which never return. It enables
|
||||
* optimization of the function, and avoids possible compiler warnings.
|
||||
*
|
||||
* Since 2.68, it is recommended that code uses %G_NORETURN instead of
|
||||
* %G_GNUC_NORETURN, as that works on more platforms and compilers (in
|
||||
* particular, MSVC and C++11) than %G_GNUC_NORETURN, which works with GCC and
|
||||
* Clang only. %G_GNUC_NORETURN continues to work, so has not been deprecated
|
||||
* yet.
|
||||
*
|
||||
* Place the attribute after the declaration, just before the semicolon.
|
||||
*
|
||||
* |[<!-- language="C" -->
|
||||
|
|
@ -915,6 +933,76 @@
|
|||
#define G_CONST_RETURN const GLIB_DEPRECATED_MACRO_IN_2_30_FOR(const)
|
||||
#endif
|
||||
|
||||
/**
|
||||
* G_NORETURN:
|
||||
*
|
||||
* Expands to the GNU C or MSVC `noreturn` function attribute depending on
|
||||
* the compiler. It is used for declaring functions which never return.
|
||||
* Enables optimization of the function, and avoids possible compiler warnings.
|
||||
*
|
||||
* Note that %G_NORETURN supersedes the previous %G_GNUC_NORETURN macro, which
|
||||
* will eventually be deprecated. %G_NORETURN supports more platforms.
|
||||
*
|
||||
* Place the attribute before the function declaration as follows:
|
||||
*
|
||||
* |[<!-- language="C" -->
|
||||
* G_NORETURN void g_abort (void);
|
||||
* ]|
|
||||
*
|
||||
* Since: 2.68
|
||||
*/
|
||||
/* Note: We can’t annotate this with GLIB_AVAILABLE_MACRO_IN_2_68 because it’s
|
||||
* used within the GLib headers in function declarations which are always
|
||||
* evaluated when a header is included. This results in warnings in third party
|
||||
* code which includes glib.h, even if the third party code doesn’t use the new
|
||||
* macro itself. */
|
||||
#if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__)) || (0x5110 <= __SUNPRO_C)
|
||||
/* For compatibility with G_NORETURN_FUNCPTR on clang, use
|
||||
__attribute__((__noreturn__)), not _Noreturn. */
|
||||
# define G_NORETURN __attribute__ ((__noreturn__))
|
||||
#elif defined (_MSC_VER) && (1200 <= _MSC_VER)
|
||||
/* Use MSVC specific syntax. */
|
||||
# define G_NORETURN __declspec (noreturn)
|
||||
/* Use ISO C++11 syntax when the compiler supports it. */
|
||||
#elif (defined (__cplusplus) && __cplusplus >= 201103 && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) || defined (_MSC_VER) && (_MSC_VER >= 1900)
|
||||
# define G_NORETURN [[noreturn]]
|
||||
/* Use ISO C11 syntax when the compiler supports it. */
|
||||
#elif (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)
|
||||
# define G_NORETURN _Noreturn
|
||||
#else
|
||||
# define G_NORETURN /* empty */
|
||||
#endif
|
||||
|
||||
/**
|
||||
* G_NORETURN_FUNCPTR:
|
||||
*
|
||||
* Expands to the GNU C or MSVC `noreturn` function attribute depending on
|
||||
* the compiler. It is used for declaring function pointers which never return.
|
||||
* Enables optimization of the function, and avoids possible compiler warnings.
|
||||
*
|
||||
* Place the attribute before the function declaration as follows:
|
||||
*
|
||||
* |[<!-- language="C" -->
|
||||
* G_NORETURN_FUNCPTR void (*funcptr) (void);
|
||||
* ]|
|
||||
*
|
||||
* Note that if the function is not a function pointer, you can simply use
|
||||
* the %G_NORETURN macro as follows:
|
||||
*
|
||||
* |[<!-- language="C" -->
|
||||
* G_NORETURN void g_abort (void);
|
||||
* ]|
|
||||
*
|
||||
* Since: 2.68
|
||||
*/
|
||||
#if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__)) || (0x5110 <= __SUNPRO_C)
|
||||
# define G_NORETURN_FUNCPTR __attribute__ ((__noreturn__)) \
|
||||
GLIB_AVAILABLE_MACRO_IN_2_68
|
||||
#else
|
||||
# define G_NORETURN_FUNCPTR /* empty */ \
|
||||
GLIB_AVAILABLE_MACRO_IN_2_68
|
||||
#endif
|
||||
|
||||
/*
|
||||
* The G_LIKELY and G_UNLIKELY macros let the programmer give hints to
|
||||
* the compiler about the expected result of an expression. Some compilers
|
||||
|
|
|
|||
|
|
@ -31,6 +31,11 @@
|
|||
|
||||
#include <glib/gutils.h>
|
||||
|
||||
#if defined(glib_typeof_2_68) && GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68
|
||||
/* for glib_typeof */
|
||||
#include <type_traits>
|
||||
#endif
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
/**
|
||||
|
|
@ -110,16 +115,18 @@ gpointer g_try_realloc_n (gpointer mem,
|
|||
gsize n_blocks,
|
||||
gsize n_block_bytes) G_GNUC_WARN_UNUSED_RESULT;
|
||||
|
||||
#if defined(g_has_typeof) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_58
|
||||
#define g_clear_pointer(pp, destroy) \
|
||||
G_STMT_START { \
|
||||
G_STATIC_ASSERT (sizeof *(pp) == sizeof (gpointer)); \
|
||||
__typeof__((pp)) _pp = (pp); \
|
||||
__typeof__(*(pp)) _ptr = *_pp; \
|
||||
*_pp = NULL; \
|
||||
if (_ptr) \
|
||||
(destroy) (_ptr); \
|
||||
} G_STMT_END \
|
||||
#if defined(glib_typeof) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_58 && (!defined(glib_typeof_2_68) || GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68)
|
||||
#define g_clear_pointer(pp, destroy) \
|
||||
G_STMT_START \
|
||||
{ \
|
||||
G_STATIC_ASSERT (sizeof *(pp) == sizeof (gpointer)); \
|
||||
glib_typeof ((pp)) _pp = (pp); \
|
||||
glib_typeof (*(pp)) _ptr = *_pp; \
|
||||
*_pp = NULL; \
|
||||
if (_ptr) \
|
||||
(destroy) (_ptr); \
|
||||
} \
|
||||
G_STMT_END \
|
||||
GLIB_AVAILABLE_MACRO_IN_2_34
|
||||
#else /* __GNUC__ */
|
||||
#define g_clear_pointer(pp, destroy) \
|
||||
|
|
@ -211,8 +218,8 @@ g_steal_pointer (gpointer pp)
|
|||
}
|
||||
|
||||
/* type safety */
|
||||
#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) && !defined(__cplusplus) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_58
|
||||
#define g_steal_pointer(pp) ((__typeof__(*pp)) (g_steal_pointer) (pp))
|
||||
#if defined(glib_typeof) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_58 && (!defined(glib_typeof_2_68) || GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68)
|
||||
#define g_steal_pointer(pp) ((glib_typeof (*pp)) (g_steal_pointer) (pp))
|
||||
#else /* __GNUC__ */
|
||||
/* This version does not depend on gcc extensions, but gcc does not warn
|
||||
* about incompatible-pointer-types: */
|
||||
|
|
|
|||
|
|
@ -242,6 +242,12 @@ GLogWriterOutput g_log_writer_default (GLogLevelFlags log_level,
|
|||
gsize n_fields,
|
||||
gpointer user_data);
|
||||
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
void g_log_writer_default_set_use_stderr (gboolean use_stderr);
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
gboolean g_log_writer_default_would_drop (GLogLevelFlags log_level,
|
||||
const char *log_domain);
|
||||
|
||||
/**
|
||||
* G_DEBUG_HERE:
|
||||
*
|
||||
|
|
@ -277,11 +283,12 @@ void g_warn_message (const char *domain,
|
|||
const char *func,
|
||||
const char *warnexpr) G_ANALYZER_NORETURN;
|
||||
GLIB_DEPRECATED
|
||||
G_NORETURN
|
||||
void g_assert_warning (const char *log_domain,
|
||||
const char *file,
|
||||
const int line,
|
||||
const char *pretty_function,
|
||||
const char *expression) G_GNUC_NORETURN;
|
||||
const char *expression);
|
||||
|
||||
GLIB_AVAILABLE_IN_2_56
|
||||
void g_log_structured_standard (const gchar *log_domain,
|
||||
|
|
@ -393,7 +400,7 @@ void g_log_structured_standard (const gchar *log_domain,
|
|||
format)
|
||||
#endif
|
||||
#else /* no varargs macros */
|
||||
static void g_error (const gchar *format, ...) G_GNUC_NORETURN G_ANALYZER_NORETURN;
|
||||
static G_NORETURN void g_error (const gchar *format, ...) G_ANALYZER_NORETURN;
|
||||
static void g_critical (const gchar *format, ...) G_ANALYZER_NORETURN;
|
||||
|
||||
static inline void
|
||||
|
|
@ -472,7 +479,7 @@ g_debug (const gchar *format,
|
|||
#if defined(G_HAVE_ISO_VARARGS) && !G_ANALYZER_ANALYZING
|
||||
#define g_warning_once(...) \
|
||||
G_STMT_START { \
|
||||
static volatile int G_PASTE (_GWarningOnceBoolean, __LINE__) = 0; \
|
||||
static int G_PASTE (_GWarningOnceBoolean, __LINE__) = 0; /* (atomic) */ \
|
||||
if (g_atomic_int_compare_and_exchange (&G_PASTE (_GWarningOnceBoolean, __LINE__), \
|
||||
0, 1)) \
|
||||
g_warning (__VA_ARGS__); \
|
||||
|
|
@ -481,7 +488,7 @@ g_debug (const gchar *format,
|
|||
#elif defined(G_HAVE_GNUC_VARARGS) && !G_ANALYZER_ANALYZING
|
||||
#define g_warning_once(format...) \
|
||||
G_STMT_START { \
|
||||
static volatile int G_PASTE (_GWarningOnceBoolean, __LINE__) = 0; \
|
||||
static int G_PASTE (_GWarningOnceBoolean, __LINE__) = 0; /* (atomic) */ \
|
||||
if (g_atomic_int_compare_and_exchange (&G_PASTE (_GWarningOnceBoolean, __LINE__), \
|
||||
0, 1)) \
|
||||
g_warning (format); \
|
||||
|
|
|
|||
|
|
@ -24,6 +24,11 @@
|
|||
|
||||
#include <glib/gmem.h>
|
||||
|
||||
#if defined(glib_typeof_2_68) && GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68
|
||||
/* for glib_typeof */
|
||||
#include <type_traits>
|
||||
#endif
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
GLIB_AVAILABLE_IN_2_58
|
||||
|
|
@ -71,18 +76,18 @@ gsize g_atomic_rc_box_get_size (gpointer mem_block);
|
|||
#define g_atomic_rc_box_new0(type) \
|
||||
((type *) g_atomic_rc_box_alloc0 (sizeof (type)))
|
||||
|
||||
#ifdef g_has_typeof
|
||||
#if defined(glib_typeof) && (!defined(glib_typeof_2_68) || GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68)
|
||||
/* Type check to avoid assigning references to different types */
|
||||
# define g_rc_box_acquire(mem_block) \
|
||||
((__typeof__(mem_block)) (g_rc_box_acquire) (mem_block))
|
||||
# define g_atomic_rc_box_acquire(mem_block) \
|
||||
((__typeof__(mem_block)) (g_atomic_rc_box_acquire) (mem_block))
|
||||
#define g_rc_box_acquire(mem_block) \
|
||||
((glib_typeof (mem_block)) (g_rc_box_acquire) (mem_block))
|
||||
#define g_atomic_rc_box_acquire(mem_block) \
|
||||
((glib_typeof (mem_block)) (g_atomic_rc_box_acquire) (mem_block))
|
||||
|
||||
/* Type check to avoid duplicating data to different types */
|
||||
# define g_rc_box_dup(block_size,mem_block) \
|
||||
((__typeof__(mem_block)) (g_rc_box_dup) (block_size,mem_block))
|
||||
# define g_atomic_rc_box_dup(block_size,mem_block) \
|
||||
((__typeof__(mem_block)) (g_atomic_rc_box_dup) (block_size,mem_block))
|
||||
#define g_rc_box_dup(block_size, mem_block) \
|
||||
((glib_typeof (mem_block)) (g_rc_box_dup) (block_size, mem_block))
|
||||
#define g_atomic_rc_box_dup(block_size, mem_block) \
|
||||
((glib_typeof (mem_block)) (g_atomic_rc_box_dup) (block_size, mem_block))
|
||||
#endif
|
||||
|
||||
G_END_DECLS
|
||||
|
|
|
|||
|
|
@ -213,6 +213,25 @@ gboolean g_spawn_async_with_pipes (const gchar *working_directory,
|
|||
gint *standard_error,
|
||||
GError **error);
|
||||
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
gboolean g_spawn_async_with_pipes_and_fds (const gchar *working_directory,
|
||||
const gchar * const *argv,
|
||||
const gchar * const *envp,
|
||||
GSpawnFlags flags,
|
||||
GSpawnChildSetupFunc child_setup,
|
||||
gpointer user_data,
|
||||
gint stdin_fd,
|
||||
gint stdout_fd,
|
||||
gint stderr_fd,
|
||||
const gint *source_fds,
|
||||
const gint *target_fds,
|
||||
gsize n_fds,
|
||||
GPid *child_pid_out,
|
||||
gint *stdin_pipe_out,
|
||||
gint *stdout_pipe_out,
|
||||
gint *stderr_pipe_out,
|
||||
GError **error);
|
||||
|
||||
/* Lets you provide fds for stdin/stdout/stderr */
|
||||
GLIB_AVAILABLE_IN_2_58
|
||||
gboolean g_spawn_async_with_fds (const gchar *working_directory,
|
||||
|
|
|
|||
|
|
@ -253,9 +253,13 @@ GLIB_AVAILABLE_IN_ALL
|
|||
gchar* g_strescape (const gchar *source,
|
||||
const gchar *exceptions) G_GNUC_MALLOC;
|
||||
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
gpointer g_memdup (gconstpointer mem,
|
||||
guint byte_size) G_GNUC_ALLOC_SIZE(2);
|
||||
GLIB_DEPRECATED_IN_2_68_FOR (g_memdup2)
|
||||
gpointer g_memdup (gconstpointer mem,
|
||||
guint byte_size) G_GNUC_ALLOC_SIZE(2);
|
||||
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
gpointer g_memdup2 (gconstpointer mem,
|
||||
gsize byte_size) G_GNUC_ALLOC_SIZE(2);
|
||||
|
||||
/* NULL terminated string arrays.
|
||||
* g_strsplit(), g_strsplit_set() split up string into max_tokens tokens
|
||||
|
|
|
|||
|
|
@ -127,6 +127,11 @@ GLIB_AVAILABLE_IN_ALL
|
|||
GString* g_string_erase (GString *string,
|
||||
gssize pos,
|
||||
gssize len);
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
guint g_string_replace (GString *string,
|
||||
const gchar *find,
|
||||
const gchar *replace,
|
||||
guint limit);
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
GString* g_string_ascii_down (GString *string);
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
|
|
|
|||
|
|
@ -0,0 +1,58 @@
|
|||
/*
|
||||
* Copyright © 2020 Canonical Ltd.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef __G_STRVBUILDER_H__
|
||||
#define __G_STRVBUILDER_H__
|
||||
|
||||
#if !defined(__GLIB_H_INSIDE__) && !defined(GLIB_COMPILATION)
|
||||
#error "Only <glib.h> can be included directly."
|
||||
#endif
|
||||
|
||||
#include <glib/gstrfuncs.h>
|
||||
#include <glib/gtypes.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
/**
|
||||
* GStrvBuilder:
|
||||
*
|
||||
* A helper object to build a %NULL-terminated string array
|
||||
* by appending. See g_strv_builder_new().
|
||||
*
|
||||
* Since: 2.68
|
||||
*/
|
||||
typedef struct _GStrvBuilder GStrvBuilder;
|
||||
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
GStrvBuilder *g_strv_builder_new (void);
|
||||
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
void g_strv_builder_unref (GStrvBuilder *builder);
|
||||
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
GStrvBuilder *g_strv_builder_ref (GStrvBuilder *builder);
|
||||
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
void g_strv_builder_add (GStrvBuilder *builder,
|
||||
const char *value);
|
||||
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
GStrv g_strv_builder_end (GStrvBuilder *builder);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __G_STRVBUILDER_H__ */
|
||||
|
|
@ -111,6 +111,51 @@ typedef void (*GTestFixtureFunc) (gpointer fixture,
|
|||
} \
|
||||
} \
|
||||
G_STMT_END
|
||||
#define g_assert_cmpstrv(strv1, strv2) \
|
||||
G_STMT_START \
|
||||
{ \
|
||||
const char * const *__strv1 = (const char * const *) (strv1); \
|
||||
const char * const *__strv2 = (const char * const *) (strv2); \
|
||||
if (!__strv1 || !__strv2) \
|
||||
{ \
|
||||
if (__strv1) \
|
||||
{ \
|
||||
g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
|
||||
"assertion failed (" #strv1 " == " #strv2 "): " #strv2 " is NULL, but " #strv1 " is not"); \
|
||||
} \
|
||||
else if (__strv2) \
|
||||
{ \
|
||||
g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
|
||||
"assertion failed (" #strv1 " == " #strv2 "): " #strv1 " is NULL, but " #strv2 " is not"); \
|
||||
} \
|
||||
} \
|
||||
else \
|
||||
{ \
|
||||
guint __l1 = g_strv_length ((char **) __strv1); \
|
||||
guint __l2 = g_strv_length ((char **) __strv2); \
|
||||
if (__l1 != __l2) \
|
||||
{ \
|
||||
char *__msg; \
|
||||
__msg = g_strdup_printf ("assertion failed (" #strv1 " == " #strv2 "): length %u does not equal length %u", __l1, __l2); \
|
||||
g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, __msg); \
|
||||
g_free (__msg); \
|
||||
} \
|
||||
else \
|
||||
{ \
|
||||
guint __i; \
|
||||
for (__i = 0; __i < __l1; __i++) \
|
||||
{ \
|
||||
if (g_strcmp0 (__strv1[__i], __strv2[__i]) != 0) \
|
||||
{ \
|
||||
g_assertion_message_cmpstrv (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
|
||||
#strv1 " == " #strv2, \
|
||||
__strv1, __strv2, __i); \
|
||||
} \
|
||||
} \
|
||||
} \
|
||||
} \
|
||||
} \
|
||||
G_STMT_END
|
||||
#define g_assert_no_errno(expr) G_STMT_START { \
|
||||
int __ret, __errsv; \
|
||||
errno = 0; \
|
||||
|
|
@ -174,6 +219,8 @@ typedef void (*GTestFixtureFunc) (gpointer fixture,
|
|||
* GCC 5 is not a strict lower bound for versions of GCC which provide __builtin_unreachable(). */
|
||||
#if __GNUC__ >= 5 || g_macro__has_builtin(__builtin_unreachable)
|
||||
#define g_assert_not_reached() G_STMT_START { (void) 0; __builtin_unreachable (); } G_STMT_END
|
||||
#elif defined (_MSC_VER)
|
||||
#define g_assert_not_reached() G_STMT_START { (void) 0; __assume (0); } G_STMT_END
|
||||
#else /* if __builtin_unreachable() is not supported: */
|
||||
#define g_assert_not_reached() G_STMT_START { (void) 0; } G_STMT_END
|
||||
#endif
|
||||
|
|
@ -291,6 +338,10 @@ void g_test_add_data_func_full (const char *testpath,
|
|||
GTestDataFunc test_func,
|
||||
GDestroyNotify data_free_func);
|
||||
|
||||
/* tell about currently run test */
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
const char * g_test_get_path (void);
|
||||
|
||||
/* tell about failure */
|
||||
GLIB_AVAILABLE_IN_2_30
|
||||
void g_test_fail (void);
|
||||
|
|
@ -469,11 +520,12 @@ void g_assertion_message (const char *domain,
|
|||
const char *func,
|
||||
const char *message) G_ANALYZER_NORETURN;
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
G_NORETURN
|
||||
void g_assertion_message_expr (const char *domain,
|
||||
const char *file,
|
||||
int line,
|
||||
const char *func,
|
||||
const char *expr) G_GNUC_NORETURN;
|
||||
const char *expr);
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
void g_assertion_message_cmpstr (const char *domain,
|
||||
const char *file,
|
||||
|
|
@ -483,6 +535,16 @@ void g_assertion_message_cmpstr (const char *domain,
|
|||
const char *arg1,
|
||||
const char *cmp,
|
||||
const char *arg2) G_ANALYZER_NORETURN;
|
||||
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
void g_assertion_message_cmpstrv (const char *domain,
|
||||
const char *file,
|
||||
int line,
|
||||
const char *func,
|
||||
const char *expr,
|
||||
const char * const *arg1,
|
||||
const char * const *arg2,
|
||||
gsize first_wrong_idx) G_ANALYZER_NORETURN;
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
void g_assertion_message_cmpnum (const char *domain,
|
||||
const char *file,
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
#error "Only <glib.h> can be included directly."
|
||||
#endif
|
||||
|
||||
#include <glib/gerror.h>
|
||||
#include <glib/gtypes.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
|
@ -52,8 +53,10 @@ typedef enum
|
|||
G_TIME_TYPE_UNIVERSAL
|
||||
} GTimeType;
|
||||
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
GLIB_DEPRECATED_IN_2_68_FOR (g_time_zone_new_identifier)
|
||||
GTimeZone * g_time_zone_new (const gchar *identifier);
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
GTimeZone * g_time_zone_new_identifier (const gchar *identifier);
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
GTimeZone * g_time_zone_new_utc (void);
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
|
|
|
|||
|
|
@ -33,12 +33,39 @@
|
|||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#undef G_TREE_DEBUG
|
||||
|
||||
typedef struct _GTree GTree;
|
||||
|
||||
/**
|
||||
* GTreeNode:
|
||||
*
|
||||
* An opaque type which identifies a specific node in a #GTree.
|
||||
*
|
||||
* Since: 2.68
|
||||
*/
|
||||
typedef struct _GTreeNode GTreeNode;
|
||||
|
||||
typedef gboolean (*GTraverseFunc) (gpointer key,
|
||||
gpointer value,
|
||||
gpointer data);
|
||||
|
||||
/**
|
||||
* GTraverseNodeFunc:
|
||||
* @node: a #GTreeNode
|
||||
* @data: user data passed to g_tree_foreach_node()
|
||||
*
|
||||
* Specifies the type of function passed to g_tree_foreach_node(). It is
|
||||
* passed each node, together with the @user_data parameter passed to
|
||||
* g_tree_foreach_node(). If the function returns %TRUE, the traversal is
|
||||
* stopped.
|
||||
*
|
||||
* Returns: %TRUE to stop the traversal
|
||||
* Since: 2.68
|
||||
*/
|
||||
typedef gboolean (*GTraverseNodeFunc) (GTreeNode *node,
|
||||
gpointer data);
|
||||
|
||||
/* Balanced binary trees
|
||||
*/
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
|
|
@ -51,16 +78,32 @@ GTree* g_tree_new_full (GCompareDataFunc key_compare_func,
|
|||
gpointer key_compare_data,
|
||||
GDestroyNotify key_destroy_func,
|
||||
GDestroyNotify value_destroy_func);
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
GTreeNode *g_tree_node_first (GTree *tree);
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
GTreeNode *g_tree_node_last (GTree *tree);
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
GTreeNode *g_tree_node_previous (GTreeNode *node);
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
GTreeNode *g_tree_node_next (GTreeNode *node);
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
GTree* g_tree_ref (GTree *tree);
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
void g_tree_unref (GTree *tree);
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
void g_tree_destroy (GTree *tree);
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
GTreeNode *g_tree_insert_node (GTree *tree,
|
||||
gpointer key,
|
||||
gpointer value);
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
void g_tree_insert (GTree *tree,
|
||||
gpointer key,
|
||||
gpointer value);
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
GTreeNode *g_tree_replace_node (GTree *tree,
|
||||
gpointer key,
|
||||
gpointer value);
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
void g_tree_replace (GTree *tree,
|
||||
gpointer key,
|
||||
|
|
@ -71,6 +114,13 @@ gboolean g_tree_remove (GTree *tree,
|
|||
GLIB_AVAILABLE_IN_ALL
|
||||
gboolean g_tree_steal (GTree *tree,
|
||||
gconstpointer key);
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
gpointer g_tree_node_key (GTreeNode *node);
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
gpointer g_tree_node_value (GTreeNode *node);
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
GTreeNode *g_tree_lookup_node (GTree *tree,
|
||||
gconstpointer key);
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
gpointer g_tree_lookup (GTree *tree,
|
||||
gconstpointer key);
|
||||
|
|
@ -83,6 +133,10 @@ GLIB_AVAILABLE_IN_ALL
|
|||
void g_tree_foreach (GTree *tree,
|
||||
GTraverseFunc func,
|
||||
gpointer user_data);
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
void g_tree_foreach_node (GTree *tree,
|
||||
GTraverseNodeFunc func,
|
||||
gpointer user_data);
|
||||
|
||||
GLIB_DEPRECATED
|
||||
void g_tree_traverse (GTree *tree,
|
||||
|
|
@ -90,15 +144,32 @@ void g_tree_traverse (GTree *tree,
|
|||
GTraverseType traverse_type,
|
||||
gpointer user_data);
|
||||
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
GTreeNode *g_tree_search_node (GTree *tree,
|
||||
GCompareFunc search_func,
|
||||
gconstpointer user_data);
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
gpointer g_tree_search (GTree *tree,
|
||||
GCompareFunc search_func,
|
||||
gconstpointer user_data);
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
GTreeNode *g_tree_lower_bound (GTree *tree,
|
||||
gconstpointer key);
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
GTreeNode *g_tree_upper_bound (GTree *tree,
|
||||
gconstpointer key);
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
gint g_tree_height (GTree *tree);
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
gint g_tree_nnodes (GTree *tree);
|
||||
|
||||
#ifdef G_TREE_DEBUG
|
||||
/*< private >*/
|
||||
#ifndef __GTK_DOC_IGNORE__
|
||||
void g_tree_dump (GTree *tree);
|
||||
#endif /* !__GTK_DOC_IGNORE__ */
|
||||
#endif /* G_TREE_DEBUG */
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __G_TREE_H__ */
|
||||
|
|
|
|||
|
|
@ -550,8 +550,8 @@ struct _GTimeVal
|
|||
glong tv_usec;
|
||||
} GLIB_DEPRECATED_TYPE_IN_2_62_FOR(GDateTime);
|
||||
|
||||
typedef gint grefcount;
|
||||
typedef volatile gint gatomicrefcount;
|
||||
typedef gint grefcount;
|
||||
typedef gint gatomicrefcount; /* should be accessed only using atomics */
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
|
|
|
|||
|
|
@ -62,6 +62,10 @@ void g_uri_unref (GUri *uri);
|
|||
* @G_URI_FLAGS_ENCODED_PATH: Same as %G_URI_FLAGS_ENCODED, for the path only.
|
||||
* @G_URI_FLAGS_ENCODED_FRAGMENT: Same as %G_URI_FLAGS_ENCODED, for the
|
||||
* fragment only.
|
||||
* @G_URI_FLAGS_SCHEME_NORMALIZE: A scheme-based normalization will be applied.
|
||||
* For example, when parsing an HTTP URI changing omitted path to `/` and
|
||||
* omitted port to `80`; and when building a URI, changing empty path to `/`
|
||||
* and default port `80`). This only supports a subset of known schemes. (Since: 2.68)
|
||||
*
|
||||
* Flags that describe a URI.
|
||||
*
|
||||
|
|
@ -83,6 +87,7 @@ typedef enum {
|
|||
G_URI_FLAGS_ENCODED_QUERY = 1 << 5,
|
||||
G_URI_FLAGS_ENCODED_PATH = 1 << 6,
|
||||
G_URI_FLAGS_ENCODED_FRAGMENT = 1 << 7,
|
||||
G_URI_FLAGS_SCHEME_NORMALIZE GLIB_AVAILABLE_ENUMERATOR_IN_2_68 = 1 << 8,
|
||||
} GUriFlags;
|
||||
|
||||
GLIB_AVAILABLE_IN_2_66
|
||||
|
|
|
|||
|
|
@ -434,7 +434,7 @@ g_bit_storage_impl (gulong number)
|
|||
# define g_abort() abort ()
|
||||
#else
|
||||
GLIB_AVAILABLE_IN_2_50
|
||||
void g_abort (void) G_GNUC_NORETURN G_ANALYZER_NORETURN;
|
||||
G_NORETURN void g_abort (void) G_ANALYZER_NORETURN;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -245,8 +245,26 @@
|
|||
*/
|
||||
#define GLIB_VERSION_2_66 (G_ENCODE_VERSION (2, 66))
|
||||
|
||||
/* evaluates to the current stable version; for development cycles,
|
||||
* this means the next stable target
|
||||
/**
|
||||
* GLIB_VERSION_2_68:
|
||||
*
|
||||
* A macro that evaluates to the 2.68 version of GLib, in a format
|
||||
* that can be used by the C pre-processor.
|
||||
*
|
||||
* Since: 2.68
|
||||
*/
|
||||
#define GLIB_VERSION_2_68 (G_ENCODE_VERSION (2, 68))
|
||||
|
||||
/**
|
||||
* GLIB_VERSION_CUR_STABLE:
|
||||
*
|
||||
* A macro that evaluates to the current stable version of GLib, in a format
|
||||
* that can be used by the C pre-processor.
|
||||
*
|
||||
* During an unstable development cycle, this evaluates to the next stable
|
||||
* (unreleased) version which will be the result of the development cycle.
|
||||
*
|
||||
* Since: 2.32
|
||||
*/
|
||||
#if (GLIB_MINOR_VERSION % 2)
|
||||
#define GLIB_VERSION_CUR_STABLE (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION + 1))
|
||||
|
|
@ -254,7 +272,17 @@
|
|||
#define GLIB_VERSION_CUR_STABLE (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION))
|
||||
#endif
|
||||
|
||||
/* evaluates to the previous stable version */
|
||||
/**
|
||||
* GLIB_VERSION_PREV_STABLE:
|
||||
*
|
||||
* A macro that evaluates to the previous stable version of GLib, in a format
|
||||
* that can be used by the C pre-processor.
|
||||
*
|
||||
* During an unstable development cycle, this evaluates to the most recent
|
||||
* released stable release, which preceded this development cycle.
|
||||
*
|
||||
* Since: 2.32
|
||||
*/
|
||||
#if (GLIB_MINOR_VERSION % 2)
|
||||
#define GLIB_VERSION_PREV_STABLE (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION - 1))
|
||||
#else
|
||||
|
|
@ -1014,4 +1042,38 @@
|
|||
# define GLIB_AVAILABLE_TYPE_IN_2_66
|
||||
#endif
|
||||
|
||||
#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68
|
||||
# define GLIB_DEPRECATED_IN_2_68 GLIB_DEPRECATED
|
||||
# define GLIB_DEPRECATED_IN_2_68_FOR(f) GLIB_DEPRECATED_FOR(f)
|
||||
# define GLIB_DEPRECATED_MACRO_IN_2_68 GLIB_DEPRECATED_MACRO
|
||||
# define GLIB_DEPRECATED_MACRO_IN_2_68_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f)
|
||||
# define GLIB_DEPRECATED_ENUMERATOR_IN_2_68 GLIB_DEPRECATED_ENUMERATOR
|
||||
# define GLIB_DEPRECATED_ENUMERATOR_IN_2_68_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f)
|
||||
# define GLIB_DEPRECATED_TYPE_IN_2_68 GLIB_DEPRECATED_TYPE
|
||||
# define GLIB_DEPRECATED_TYPE_IN_2_68_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f)
|
||||
#else
|
||||
# define GLIB_DEPRECATED_IN_2_68 _GLIB_EXTERN
|
||||
# define GLIB_DEPRECATED_IN_2_68_FOR(f) _GLIB_EXTERN
|
||||
# define GLIB_DEPRECATED_MACRO_IN_2_68
|
||||
# define GLIB_DEPRECATED_MACRO_IN_2_68_FOR(f)
|
||||
# define GLIB_DEPRECATED_ENUMERATOR_IN_2_68
|
||||
# define GLIB_DEPRECATED_ENUMERATOR_IN_2_68_FOR(f)
|
||||
# define GLIB_DEPRECATED_TYPE_IN_2_68
|
||||
# define GLIB_DEPRECATED_TYPE_IN_2_68_FOR(f)
|
||||
#endif
|
||||
|
||||
#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_68
|
||||
# define GLIB_AVAILABLE_IN_2_68 GLIB_UNAVAILABLE(2, 68)
|
||||
# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_68 GLIB_UNAVAILABLE_STATIC_INLINE(2, 68)
|
||||
# define GLIB_AVAILABLE_MACRO_IN_2_68 GLIB_UNAVAILABLE_MACRO(2, 68)
|
||||
# define GLIB_AVAILABLE_ENUMERATOR_IN_2_68 GLIB_UNAVAILABLE_ENUMERATOR(2, 68)
|
||||
# define GLIB_AVAILABLE_TYPE_IN_2_68 GLIB_UNAVAILABLE_TYPE(2, 68)
|
||||
#else
|
||||
# define GLIB_AVAILABLE_IN_2_68 _GLIB_EXTERN
|
||||
# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_68
|
||||
# define GLIB_AVAILABLE_MACRO_IN_2_68
|
||||
# define GLIB_AVAILABLE_ENUMERATOR_IN_2_68
|
||||
# define GLIB_AVAILABLE_TYPE_IN_2_68
|
||||
#endif
|
||||
|
||||
#endif /* __G_VERSION_MACROS_H__ */
|
||||
|
|
|
|||
|
|
@ -108,10 +108,14 @@ GType g_binding_get_type (void) G_GNUC_CONST;
|
|||
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
GBindingFlags g_binding_get_flags (GBinding *binding);
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
GLIB_DEPRECATED_IN_2_68_FOR(g_binding_dup_source)
|
||||
GObject * g_binding_get_source (GBinding *binding);
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
GObject * g_binding_dup_source (GBinding *binding);
|
||||
GLIB_DEPRECATED_IN_2_68_FOR(g_binding_dup_target)
|
||||
GObject * g_binding_get_target (GBinding *binding);
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
GObject * g_binding_dup_target (GBinding *binding);
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
const gchar * g_binding_get_source_property (GBinding *binding);
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
|
|
|
|||
|
|
@ -175,20 +175,20 @@ struct _GClosureNotifyData
|
|||
struct _GClosure
|
||||
{
|
||||
/*< private >*/
|
||||
volatile guint ref_count : 15;
|
||||
guint ref_count : 15; /* (atomic) */
|
||||
/* meta_marshal is not used anymore but must be zero for historical reasons
|
||||
as it was exposed in the G_CLOSURE_N_NOTIFIERS macro */
|
||||
volatile guint meta_marshal_nouse : 1;
|
||||
volatile guint n_guards : 1;
|
||||
volatile guint n_fnotifiers : 2; /* finalization notifiers */
|
||||
volatile guint n_inotifiers : 8; /* invalidation notifiers */
|
||||
volatile guint in_inotify : 1;
|
||||
volatile guint floating : 1;
|
||||
guint meta_marshal_nouse : 1; /* (atomic) */
|
||||
guint n_guards : 1; /* (atomic) */
|
||||
guint n_fnotifiers : 2; /* finalization notifiers (atomic) */
|
||||
guint n_inotifiers : 8; /* invalidation notifiers (atomic) */
|
||||
guint in_inotify : 1; /* (atomic) */
|
||||
guint floating : 1; /* (atomic) */
|
||||
/*< protected >*/
|
||||
volatile guint derivative_flag : 1;
|
||||
guint derivative_flag : 1; /* (atomic) */
|
||||
/*< public >*/
|
||||
volatile guint in_marshal : 1;
|
||||
volatile guint is_invalid : 1;
|
||||
guint in_marshal : 1; /* (atomic) */
|
||||
guint is_invalid : 1; /* (atomic) */
|
||||
|
||||
/*< private >*/ void (*marshal) (GClosure *closure,
|
||||
GValue /*out*/ *return_value,
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
/* enumerations from "../../../../../source/glib/glib-2.66.4/gobject/../glib/gunicode.h" */
|
||||
/* enumerations from "../../../../../source/glib/glib-2.68.3/gobject/../glib/gunicode.h" */
|
||||
GLIB_AVAILABLE_IN_2_60 GType g_unicode_type_get_type (void) G_GNUC_CONST;
|
||||
#define G_TYPE_UNICODE_TYPE (g_unicode_type_get_type ())
|
||||
GLIB_AVAILABLE_IN_2_60 GType g_unicode_break_type_get_type (void) G_GNUC_CONST;
|
||||
|
|
|
|||
|
|
@ -306,6 +306,15 @@ typedef gsize GType;
|
|||
*/
|
||||
#define G_TYPE_URI (g_uri_get_type ())
|
||||
|
||||
/**
|
||||
* G_TYPE_TREE:
|
||||
*
|
||||
* The #GType for #GTree.
|
||||
*
|
||||
* Since: 2.68
|
||||
*/
|
||||
#define G_TYPE_TREE (g_tree_get_type ())
|
||||
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
GType g_date_get_type (void) G_GNUC_CONST;
|
||||
GLIB_AVAILABLE_IN_ALL
|
||||
|
|
@ -364,6 +373,8 @@ GLIB_AVAILABLE_IN_2_44
|
|||
GType g_option_group_get_type (void) G_GNUC_CONST;
|
||||
GLIB_AVAILABLE_IN_2_66
|
||||
GType g_uri_get_type (void) G_GNUC_CONST;
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
GType g_tree_get_type (void) G_GNUC_CONST;
|
||||
|
||||
GLIB_DEPRECATED_FOR('G_TYPE_VARIANT')
|
||||
GType g_variant_get_gtype (void) G_GNUC_CONST;
|
||||
|
|
|
|||
|
|
@ -28,6 +28,11 @@
|
|||
#include <gobject/gsignal.h>
|
||||
#include <gobject/gboxed.h>
|
||||
|
||||
#if defined(glib_typeof_2_68) && GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68
|
||||
/* for glib_typeof */
|
||||
#include <type_traits>
|
||||
#endif
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
/* --- type macros --- */
|
||||
|
|
@ -227,11 +232,11 @@ typedef void (*GObjectFinalizeFunc) (GObject *object);
|
|||
/**
|
||||
* GWeakNotify:
|
||||
* @data: data that was provided when the weak reference was established
|
||||
* @where_the_object_was: the object being finalized
|
||||
* @where_the_object_was: the object being disposed
|
||||
*
|
||||
* A #GWeakNotify function can be added to an object as a callback that gets
|
||||
* triggered when the object is finalized. Since the object is already being
|
||||
* finalized when the #GWeakNotify is called, there's not much you could do
|
||||
* disposed when the #GWeakNotify is called, there's not much you could do
|
||||
* with the object, apart from e.g. using its address as hash-index or the like.
|
||||
*/
|
||||
typedef void (*GWeakNotify) (gpointer data,
|
||||
|
|
@ -247,7 +252,7 @@ struct _GObject
|
|||
GTypeInstance g_type_instance;
|
||||
|
||||
/*< private >*/
|
||||
volatile guint ref_count;
|
||||
guint ref_count; /* (atomic) */
|
||||
GData *qdata;
|
||||
};
|
||||
/**
|
||||
|
|
@ -513,10 +518,10 @@ GLIB_AVAILABLE_IN_ALL
|
|||
void g_object_remove_weak_pointer (GObject *object,
|
||||
gpointer *weak_pointer_location);
|
||||
|
||||
#if defined(g_has_typeof) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_56
|
||||
#if defined(glib_typeof) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_56 && (!defined(glib_typeof_2_68) || GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68)
|
||||
/* Make reference APIs type safe with macros */
|
||||
#define g_object_ref(Obj) ((__typeof__(Obj)) (g_object_ref) (Obj))
|
||||
#define g_object_ref_sink(Obj) ((__typeof__(Obj)) (g_object_ref_sink) (Obj))
|
||||
#define g_object_ref(Obj) ((glib_typeof (Obj)) (g_object_ref) (Obj))
|
||||
#define g_object_ref_sink(Obj) ((glib_typeof (Obj)) (g_object_ref_sink) (Obj))
|
||||
#endif
|
||||
|
||||
/**
|
||||
|
|
@ -679,16 +684,16 @@ void g_clear_object (GObject **object_ptr);
|
|||
|
||||
/**
|
||||
* g_set_object: (skip)
|
||||
* @object_ptr: a pointer to a #GObject reference
|
||||
* @object_ptr: (inout) (not optional) (nullable): a pointer to a #GObject reference
|
||||
* @new_object: (nullable) (transfer none): a pointer to the new #GObject to
|
||||
* assign to it, or %NULL to clear the pointer
|
||||
* assign to @object_ptr, or %NULL to clear the pointer
|
||||
*
|
||||
* Updates a #GObject pointer to refer to @new_object. It increments the
|
||||
* reference count of @new_object (if non-%NULL), decrements the reference
|
||||
* count of the current value of @object_ptr (if non-%NULL), and assigns
|
||||
* @new_object to @object_ptr. The assignment is not atomic.
|
||||
*
|
||||
* @object_ptr must not be %NULL.
|
||||
* @object_ptr must not be %NULL, but can point to a %NULL value.
|
||||
*
|
||||
* A macro is also included that allows this function to be used without
|
||||
* pointer casts. The function itself is static inline, so its address may vary
|
||||
|
|
|
|||
|
|
@ -119,7 +119,10 @@ typedef gboolean (*GSignalAccumulator) (GSignalInvocationHint *ihint,
|
|||
* @G_SIGNAL_DEPRECATED: The signal is deprecated and will be removed
|
||||
* in a future version. A warning will be generated if it is connected while
|
||||
* running with G_ENABLE_DIAGNOSTIC=1. Since 2.32.
|
||||
*
|
||||
* @G_SIGNAL_ACCUMULATOR_FIRST_RUN: Only used in #GSignalAccumulator accumulator
|
||||
* functions for the #GSignalInvocationHint::run_type field to mark the first
|
||||
* call to the accumulator function for a signal emission. Since 2.68.
|
||||
*
|
||||
* The signal flags are used to specify a signal's behaviour, the overall
|
||||
* signal description outlines how especially the RUN flags control the
|
||||
* stages of a signal emission.
|
||||
|
|
@ -134,7 +137,9 @@ typedef enum
|
|||
G_SIGNAL_ACTION = 1 << 5,
|
||||
G_SIGNAL_NO_HOOKS = 1 << 6,
|
||||
G_SIGNAL_MUST_COLLECT = 1 << 7,
|
||||
G_SIGNAL_DEPRECATED = 1 << 8
|
||||
G_SIGNAL_DEPRECATED = 1 << 8,
|
||||
/* normal signal flags until 1 << 16 */
|
||||
G_SIGNAL_ACCUMULATOR_FIRST_RUN = 1 << 17,
|
||||
} GSignalFlags;
|
||||
/**
|
||||
* G_SIGNAL_FLAGS_MASK:
|
||||
|
|
@ -215,7 +220,9 @@ typedef enum
|
|||
* @detail: The detail passed on for this emission
|
||||
* @run_type: The stage the signal emission is currently in, this
|
||||
* field will contain one of %G_SIGNAL_RUN_FIRST,
|
||||
* %G_SIGNAL_RUN_LAST or %G_SIGNAL_RUN_CLEANUP.
|
||||
* %G_SIGNAL_RUN_LAST or %G_SIGNAL_RUN_CLEANUP and %G_SIGNAL_ACCUMULATOR_FIRST_RUN.
|
||||
* %G_SIGNAL_ACCUMULATOR_FIRST_RUN is only set for the first run of the accumulator
|
||||
* function for a signal emission.
|
||||
*
|
||||
* The #GSignalInvocationHint structure is used to pass on additional information
|
||||
* to callbacks during a signal emission.
|
||||
|
|
@ -444,13 +451,14 @@ void g_clear_signal_handler (gulong *handler_id_ptr,
|
|||
|
||||
#define g_clear_signal_handler(handler_id_ptr, instance) \
|
||||
G_STMT_START { \
|
||||
G_STATIC_ASSERT (sizeof *(handler_id_ptr) == sizeof (gulong)); \
|
||||
gulong _handler_id = *(handler_id_ptr); \
|
||||
gpointer const _instance = (instance); \
|
||||
gulong *const _handler_id_ptr = (handler_id_ptr); \
|
||||
const gulong _handler_id = *_handler_id_ptr; \
|
||||
\
|
||||
if (_handler_id > 0) \
|
||||
{ \
|
||||
g_signal_handler_disconnect ((instance), _handler_id); \
|
||||
*(handler_id_ptr) = 0; \
|
||||
*_handler_id_ptr = 0; \
|
||||
g_signal_handler_disconnect (_instance, _handler_id); \
|
||||
} \
|
||||
} G_STMT_END \
|
||||
GLIB_AVAILABLE_MACRO_IN_2_62
|
||||
|
|
|
|||
|
|
@ -981,7 +981,7 @@ typedef void (*GTypeInterfaceCheckFunc) (gpointer check_data,
|
|||
/**
|
||||
* GTypeFundamentalFlags:
|
||||
* @G_TYPE_FLAG_CLASSED: Indicates a classed type
|
||||
* @G_TYPE_FLAG_INSTANTIATABLE: Indicates an instantiable type (implies classed)
|
||||
* @G_TYPE_FLAG_INSTANTIATABLE: Indicates an instantiatable type (implies classed)
|
||||
* @G_TYPE_FLAG_DERIVABLE: Indicates a flat derivable type
|
||||
* @G_TYPE_FLAG_DEEP_DERIVABLE: Indicates a deep derivable type (implies derivable)
|
||||
*
|
||||
|
|
@ -1300,6 +1300,9 @@ void g_type_interface_add_prerequisite (GType interface_type,
|
|||
GLIB_AVAILABLE_IN_ALL
|
||||
GType*g_type_interface_prerequisites (GType interface_type,
|
||||
guint *n_prerequisites);
|
||||
GLIB_AVAILABLE_IN_2_68
|
||||
GType g_type_interface_instantiatable_prerequisite
|
||||
(GType interface_type);
|
||||
GLIB_DEPRECATED_IN_2_58
|
||||
void g_type_class_add_private (gpointer g_class,
|
||||
gsize private_size);
|
||||
|
|
@ -1331,12 +1334,12 @@ guint g_type_get_type_registration_serial (void);
|
|||
/* --- GType boilerplate --- */
|
||||
/**
|
||||
* G_DECLARE_FINAL_TYPE:
|
||||
* @ModuleObjName: The name of the new type, in camel case (like GtkWidget)
|
||||
* @ModuleObjName: The name of the new type, in camel case (like `GtkWidget`)
|
||||
* @module_obj_name: The name of the new type in lowercase, with words
|
||||
* separated by '_' (like 'gtk_widget')
|
||||
* @MODULE: The name of the module, in all caps (like 'GTK')
|
||||
* @OBJ_NAME: The bare name of the type, in all caps (like 'WIDGET')
|
||||
* @ParentName: the name of the parent type, in camel case (like GtkWidget)
|
||||
* separated by `_` (like `gtk_widget`)
|
||||
* @MODULE: The name of the module, in all caps (like `GTK`)
|
||||
* @OBJ_NAME: The bare name of the type, in all caps (like `WIDGET`)
|
||||
* @ParentName: the name of the parent type, in camel case (like `GtkWidget`)
|
||||
*
|
||||
* A convenience macro for emitting the usual declarations in the header file for a type which is not (at the
|
||||
* present time) intended to be subclassed.
|
||||
|
|
@ -1361,15 +1364,15 @@ guint g_type_get_type_registration_serial (void);
|
|||
*
|
||||
* This results in the following things happening:
|
||||
*
|
||||
* - the usual my_app_window_get_type() function is declared with a return type of #GType
|
||||
* - the usual `my_app_window_get_type()` function is declared with a return type of #GType
|
||||
*
|
||||
* - the MyAppWindow types is defined as a typedef of struct _MyAppWindow. The struct itself is not
|
||||
* - the `MyAppWindow` type is defined as a `typedef` of `struct _MyAppWindow`. The struct itself is not
|
||||
* defined and should be defined from the .c file before G_DEFINE_TYPE() is used.
|
||||
*
|
||||
* - the MY_APP_WINDOW() cast is emitted as static inline function along with the MY_APP_IS_WINDOW() type
|
||||
* - the `MY_APP_WINDOW()` cast is emitted as `static inline` function along with the `MY_APP_IS_WINDOW()` type
|
||||
* checking function
|
||||
*
|
||||
* - the MyAppWindowClass type is defined as a struct containing GtkWindowClass. This is done for the
|
||||
* - the `MyAppWindowClass` type is defined as a struct containing `GtkWindowClass`. This is done for the
|
||||
* convenience of the person defining the type and should not be considered to be part of the ABI. In
|
||||
* particular, without a firm declaration of the instance structure, it is not possible to subclass the type
|
||||
* and therefore the fact that the size of the class structure is exposed is not a concern and it can be
|
||||
|
|
@ -1379,10 +1382,10 @@ guint g_type_get_type_registration_serial (void);
|
|||
*
|
||||
* You can only use this function if your parent type also supports g_autoptr().
|
||||
*
|
||||
* Because the type macro (MY_APP_TYPE_WINDOW in the above example) is not a callable, you must continue to
|
||||
* Because the type macro (`MY_APP_TYPE_WINDOW` in the above example) is not a callable, you must continue to
|
||||
* manually define this as a macro for yourself.
|
||||
*
|
||||
* The declaration of the _get_type() function is the first thing emitted by the macro. This allows this macro
|
||||
* The declaration of the `_get_type()` function is the first thing emitted by the macro. This allows this macro
|
||||
* to be used in the usual way with export control and API versioning macros.
|
||||
*
|
||||
* If you want to declare your own class structure, use G_DECLARE_DERIVABLE_TYPE().
|
||||
|
|
@ -1412,12 +1415,12 @@ guint g_type_get_type_registration_serial (void);
|
|||
|
||||
/**
|
||||
* G_DECLARE_DERIVABLE_TYPE:
|
||||
* @ModuleObjName: The name of the new type, in camel case (like GtkWidget)
|
||||
* @ModuleObjName: The name of the new type, in camel case (like `GtkWidget`)
|
||||
* @module_obj_name: The name of the new type in lowercase, with words
|
||||
* separated by '_' (like 'gtk_widget')
|
||||
* @MODULE: The name of the module, in all caps (like 'GTK')
|
||||
* @OBJ_NAME: The bare name of the type, in all caps (like 'WIDGET')
|
||||
* @ParentName: the name of the parent type, in camel case (like GtkWidget)
|
||||
* separated by `_` (like `gtk_widget`)
|
||||
* @MODULE: The name of the module, in all caps (like `GTK`)
|
||||
* @OBJ_NAME: The bare name of the type, in all caps (like `WIDGET`)
|
||||
* @ParentName: the name of the parent type, in camel case (like `GtkWidget`)
|
||||
*
|
||||
* A convenience macro for emitting the usual declarations in the
|
||||
* header file for a type which is intended to be subclassed.
|
||||
|
|
@ -1451,26 +1454,26 @@ guint g_type_get_type_registration_serial (void);
|
|||
*
|
||||
* This results in the following things happening:
|
||||
*
|
||||
* - the usual gtk_frobber_get_type() function is declared with a return type of #GType
|
||||
* - the usual `gtk_frobber_get_type()` function is declared with a return type of #GType
|
||||
*
|
||||
* - the GtkFrobber struct is created with GtkWidget as the first and only item. You are expected to use
|
||||
* - the `GtkFrobber` struct is created with `GtkWidget` as the first and only item. You are expected to use
|
||||
* a private structure from your .c file to store your instance variables.
|
||||
*
|
||||
* - the GtkFrobberClass type is defined as a typedef to struct _GtkFrobberClass, which is left undefined.
|
||||
* - the `GtkFrobberClass` type is defined as a typedef to `struct _GtkFrobberClass`, which is left undefined.
|
||||
* You should do this from the header file directly after you use the macro.
|
||||
*
|
||||
* - the GTK_FROBBER() and GTK_FROBBER_CLASS() casts are emitted as static inline functions along with
|
||||
* the GTK_IS_FROBBER() and GTK_IS_FROBBER_CLASS() type checking functions and GTK_FROBBER_GET_CLASS()
|
||||
* - the `GTK_FROBBER()` and `GTK_FROBBER_CLASS()` casts are emitted as `static inline` functions along with
|
||||
* the `GTK_IS_FROBBER()` and `GTK_IS_FROBBER_CLASS()` type checking functions and `GTK_FROBBER_GET_CLASS()`
|
||||
* function.
|
||||
*
|
||||
* - g_autoptr() support being added for your type, based on the type of your parent class
|
||||
*
|
||||
* You can only use this function if your parent type also supports g_autoptr().
|
||||
*
|
||||
* Because the type macro (GTK_TYPE_FROBBER in the above example) is not a callable, you must continue to
|
||||
* Because the type macro (`GTK_TYPE_FROBBER` in the above example) is not a callable, you must continue to
|
||||
* manually define this as a macro for yourself.
|
||||
*
|
||||
* The declaration of the _get_type() function is the first thing emitted by the macro. This allows this macro
|
||||
* The declaration of the `_get_type()` function is the first thing emitted by the macro. This allows this macro
|
||||
* to be used in the usual way with export control and API versioning macros.
|
||||
*
|
||||
* If you are writing a library, it is important to note that it is possible to convert a type from using
|
||||
|
|
@ -1510,14 +1513,14 @@ guint g_type_get_type_registration_serial (void);
|
|||
|
||||
/**
|
||||
* G_DECLARE_INTERFACE:
|
||||
* @ModuleObjName: The name of the new type, in camel case (like GtkWidget)
|
||||
* @ModuleObjName: The name of the new type, in camel case (like `GtkWidget`)
|
||||
* @module_obj_name: The name of the new type in lowercase, with words
|
||||
* separated by '_' (like 'gtk_widget')
|
||||
* @MODULE: The name of the module, in all caps (like 'GTK')
|
||||
* @OBJ_NAME: The bare name of the type, in all caps (like 'WIDGET')
|
||||
* @PrerequisiteName: the name of the prerequisite type, in camel case (like GtkWidget)
|
||||
* separated by `_` (like `gtk_widget`)
|
||||
* @MODULE: The name of the module, in all caps (like `GTK`)
|
||||
* @OBJ_NAME: The bare name of the type, in all caps (like `WIDGET`)
|
||||
* @PrerequisiteName: the name of the prerequisite type, in camel case (like `GtkWidget`)
|
||||
*
|
||||
* A convenience macro for emitting the usual declarations in the header file for a GInterface type.
|
||||
* A convenience macro for emitting the usual declarations in the header file for a #GInterface type.
|
||||
*
|
||||
* You might use it in a header as follows:
|
||||
*
|
||||
|
|
@ -1545,23 +1548,23 @@ guint g_type_get_type_registration_serial (void);
|
|||
*
|
||||
* This results in the following things happening:
|
||||
*
|
||||
* - the usual my_model_get_type() function is declared with a return type of #GType
|
||||
* - the usual `my_model_get_type()` function is declared with a return type of #GType
|
||||
*
|
||||
* - the MyModelInterface type is defined as a typedef to struct _MyModelInterface,
|
||||
* - the `MyModelInterface` type is defined as a typedef to `struct _MyModelInterface`,
|
||||
* which is left undefined. You should do this from the header file directly after
|
||||
* you use the macro.
|
||||
*
|
||||
* - the MY_MODEL() cast is emitted as static inline functions along with
|
||||
* the MY_IS_MODEL() type checking function and MY_MODEL_GET_IFACE() function.
|
||||
* - the `MY_MODEL()` cast is emitted as `static inline` functions along with
|
||||
* the `MY_IS_MODEL()` type checking function and `MY_MODEL_GET_IFACE()` function.
|
||||
*
|
||||
* - g_autoptr() support being added for your type, based on your prerequisite type.
|
||||
*
|
||||
* You can only use this function if your prerequisite type also supports g_autoptr().
|
||||
*
|
||||
* Because the type macro (MY_TYPE_MODEL in the above example) is not a callable, you must continue to
|
||||
* Because the type macro (`MY_TYPE_MODEL` in the above example) is not a callable, you must continue to
|
||||
* manually define this as a macro for yourself.
|
||||
*
|
||||
* The declaration of the _get_type() function is the first thing emitted by the macro. This allows this macro
|
||||
* The declaration of the `_get_type()` function is the first thing emitted by the macro. This allows this macro
|
||||
* to be used in the usual way with export control and API versioning macros.
|
||||
*
|
||||
* Since: 2.44
|
||||
|
|
@ -1586,13 +1589,13 @@ guint g_type_get_type_registration_serial (void);
|
|||
* G_DEFINE_TYPE:
|
||||
* @TN: The name of the new type, in Camel case.
|
||||
* @t_n: The name of the new type, in lowercase, with words
|
||||
* separated by '_'.
|
||||
* separated by `_`.
|
||||
* @T_P: The #GType of the parent type.
|
||||
*
|
||||
* A convenience macro for type implementations, which declares a class
|
||||
* initialization function, an instance initialization function (see #GTypeInfo
|
||||
* for information about these) and a static variable named `t_n_parent_class`
|
||||
* pointing to the parent class. Furthermore, it defines a *_get_type() function.
|
||||
* pointing to the parent class. Furthermore, it defines a `*_get_type()` function.
|
||||
* See G_DEFINE_TYPE_EXTENDED() for an example.
|
||||
*
|
||||
* Since: 2.4
|
||||
|
|
@ -1601,13 +1604,13 @@ guint g_type_get_type_registration_serial (void);
|
|||
/**
|
||||
* G_DEFINE_TYPE_WITH_CODE:
|
||||
* @TN: The name of the new type, in Camel case.
|
||||
* @t_n: The name of the new type in lowercase, with words separated by '_'.
|
||||
* @t_n: The name of the new type in lowercase, with words separated by `_`.
|
||||
* @T_P: The #GType of the parent type.
|
||||
* @_C_: Custom code that gets inserted in the *_get_type() function.
|
||||
* @_C_: Custom code that gets inserted in the `*_get_type()` function.
|
||||
*
|
||||
* A convenience macro for type implementations.
|
||||
* Similar to G_DEFINE_TYPE(), but allows you to insert custom code into the
|
||||
* *_get_type() function, e.g. interface implementations via G_IMPLEMENT_INTERFACE().
|
||||
* `*_get_type()` function, e.g. interface implementations via G_IMPLEMENT_INTERFACE().
|
||||
* See G_DEFINE_TYPE_EXTENDED() for an example.
|
||||
*
|
||||
* Since: 2.4
|
||||
|
|
@ -1617,18 +1620,18 @@ guint g_type_get_type_registration_serial (void);
|
|||
* G_DEFINE_TYPE_WITH_PRIVATE:
|
||||
* @TN: The name of the new type, in Camel case.
|
||||
* @t_n: The name of the new type, in lowercase, with words
|
||||
* separated by '_'.
|
||||
* separated by `_`.
|
||||
* @T_P: The #GType of the parent type.
|
||||
*
|
||||
* A convenience macro for type implementations, which declares a class
|
||||
* initialization function, an instance initialization function (see #GTypeInfo
|
||||
* for information about these), a static variable named `t_n_parent_class`
|
||||
* pointing to the parent class, and adds private instance data to the type.
|
||||
* Furthermore, it defines a *_get_type() function. See G_DEFINE_TYPE_EXTENDED()
|
||||
* Furthermore, it defines a `*_get_type()` function. See G_DEFINE_TYPE_EXTENDED()
|
||||
* for an example.
|
||||
*
|
||||
* Note that private structs added with this macros must have a struct
|
||||
* name of the form @TN Private.
|
||||
* name of the form `TN ## Private`.
|
||||
*
|
||||
* The private instance data can be retrieved using the automatically generated
|
||||
* getter function `t_n_get_instance_private()`.
|
||||
|
|
@ -1642,7 +1645,7 @@ guint g_type_get_type_registration_serial (void);
|
|||
* G_DEFINE_ABSTRACT_TYPE:
|
||||
* @TN: The name of the new type, in Camel case.
|
||||
* @t_n: The name of the new type, in lowercase, with words
|
||||
* separated by '_'.
|
||||
* separated by `_`.
|
||||
* @T_P: The #GType of the parent type.
|
||||
*
|
||||
* A convenience macro for type implementations.
|
||||
|
|
@ -1656,13 +1659,13 @@ guint g_type_get_type_registration_serial (void);
|
|||
* G_DEFINE_ABSTRACT_TYPE_WITH_CODE:
|
||||
* @TN: The name of the new type, in Camel case.
|
||||
* @t_n: The name of the new type, in lowercase, with words
|
||||
* separated by '_'.
|
||||
* separated by `_`.
|
||||
* @T_P: The #GType of the parent type.
|
||||
* @_C_: Custom code that gets inserted in the @type_name_get_type() function.
|
||||
* @_C_: Custom code that gets inserted in the `type_name_get_type()` function.
|
||||
*
|
||||
* A convenience macro for type implementations.
|
||||
* Similar to G_DEFINE_TYPE_WITH_CODE(), but defines an abstract type and
|
||||
* allows you to insert custom code into the *_get_type() function, e.g.
|
||||
* allows you to insert custom code into the `*_get_type()` function, e.g.
|
||||
* interface implementations via G_IMPLEMENT_INTERFACE().
|
||||
* See G_DEFINE_TYPE_EXTENDED() for an example.
|
||||
*
|
||||
|
|
@ -1673,7 +1676,7 @@ guint g_type_get_type_registration_serial (void);
|
|||
* G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE:
|
||||
* @TN: The name of the new type, in Camel case.
|
||||
* @t_n: The name of the new type, in lowercase, with words
|
||||
* separated by '_'.
|
||||
* separated by `_`.
|
||||
* @T_P: The #GType of the parent type.
|
||||
*
|
||||
* Similar to G_DEFINE_TYPE_WITH_PRIVATE(), but defines an abstract type.
|
||||
|
|
@ -1686,10 +1689,10 @@ guint g_type_get_type_registration_serial (void);
|
|||
* G_DEFINE_TYPE_EXTENDED:
|
||||
* @TN: The name of the new type, in Camel case.
|
||||
* @t_n: The name of the new type, in lowercase, with words
|
||||
* separated by '_'.
|
||||
* separated by `_`.
|
||||
* @T_P: The #GType of the parent type.
|
||||
* @_f_: #GTypeFlags to pass to g_type_register_static()
|
||||
* @_C_: Custom code that gets inserted in the *_get_type() function.
|
||||
* @_C_: Custom code that gets inserted in the `*_get_type()` function.
|
||||
*
|
||||
* The most general convenience macro for type implementations, on which
|
||||
* G_DEFINE_TYPE(), etc are based.
|
||||
|
|
@ -1724,8 +1727,8 @@ guint g_type_get_type_registration_serial (void);
|
|||
* GType
|
||||
* gtk_gadget_get_type (void)
|
||||
* {
|
||||
* static volatile gsize g_define_type_id__volatile = 0;
|
||||
* if (g_once_init_enter (&g_define_type_id__volatile))
|
||||
* static gsize static_g_define_type_id = 0;
|
||||
* if (g_once_init_enter (&static_g_define_type_id))
|
||||
* {
|
||||
* GType g_define_type_id =
|
||||
* g_type_register_static_simple (GTK_TYPE_WIDGET,
|
||||
|
|
@ -1745,9 +1748,9 @@ guint g_type_get_type_registration_serial (void);
|
|||
* };
|
||||
* g_type_add_interface_static (g_define_type_id, TYPE_GIZMO, &g_implement_interface_info);
|
||||
* }
|
||||
* g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
|
||||
* g_once_init_leave (&static_g_define_type_id, g_define_type_id);
|
||||
* }
|
||||
* return g_define_type_id__volatile;
|
||||
* return static_g_define_type_id;
|
||||
* }
|
||||
* ]|
|
||||
* The only pieces which have to be manually provided are the definitions of
|
||||
|
|
@ -1761,12 +1764,12 @@ guint g_type_get_type_registration_serial (void);
|
|||
/**
|
||||
* G_DEFINE_INTERFACE:
|
||||
* @TN: The name of the new type, in Camel case.
|
||||
* @t_n: The name of the new type, in lowercase, with words separated by '_'.
|
||||
* @T_P: The #GType of the prerequisite type for the interface, or 0
|
||||
* (%G_TYPE_INVALID) for no prerequisite type.
|
||||
* @t_n: The name of the new type, in lowercase, with words separated by `_`.
|
||||
* @T_P: The #GType of the prerequisite type for the interface, or %G_TYPE_INVALID
|
||||
* for no prerequisite type.
|
||||
*
|
||||
* A convenience macro for #GTypeInterface definitions, which declares
|
||||
* a default vtable initialization function and defines a *_get_type()
|
||||
* a default vtable initialization function and defines a `*_get_type()`
|
||||
* function.
|
||||
*
|
||||
* The macro expects the interface initialization function to have the
|
||||
|
|
@ -1786,14 +1789,14 @@ guint g_type_get_type_registration_serial (void);
|
|||
/**
|
||||
* G_DEFINE_INTERFACE_WITH_CODE:
|
||||
* @TN: The name of the new type, in Camel case.
|
||||
* @t_n: The name of the new type, in lowercase, with words separated by '_'.
|
||||
* @T_P: The #GType of the prerequisite type for the interface, or 0
|
||||
* (%G_TYPE_INVALID) for no prerequisite type.
|
||||
* @_C_: Custom code that gets inserted in the *_get_type() function.
|
||||
* @t_n: The name of the new type, in lowercase, with words separated by `_`.
|
||||
* @T_P: The #GType of the prerequisite type for the interface, or %G_TYPE_INVALID
|
||||
* for no prerequisite type.
|
||||
* @_C_: Custom code that gets inserted in the `*_get_type()` function.
|
||||
*
|
||||
* A convenience macro for #GTypeInterface definitions. Similar to
|
||||
* G_DEFINE_INTERFACE(), but allows you to insert custom code into the
|
||||
* *_get_type() function, e.g. additional interface implementations
|
||||
* `*_get_type()` function, e.g. additional interface implementations
|
||||
* via G_IMPLEMENT_INTERFACE(), or additional prerequisite types. See
|
||||
* G_DEFINE_TYPE_EXTENDED() for a similar example using
|
||||
* G_DEFINE_TYPE_WITH_CODE().
|
||||
|
|
@ -1811,7 +1814,7 @@ guint g_type_get_type_registration_serial (void);
|
|||
* of G_DEFINE_TYPE_WITH_CODE() or G_DEFINE_ABSTRACT_TYPE_WITH_CODE().
|
||||
* See G_DEFINE_TYPE_EXTENDED() for an example.
|
||||
*
|
||||
* Note that this macro can only be used together with the G_DEFINE_TYPE_*
|
||||
* Note that this macro can only be used together with the `G_DEFINE_TYPE_*`
|
||||
* macros, since it depends on variable names from those macros.
|
||||
*
|
||||
* Since: 2.4
|
||||
|
|
@ -1846,10 +1849,10 @@ guint g_type_get_type_registration_serial (void);
|
|||
* G_ADD_PRIVATE (MyObject))
|
||||
* ]|
|
||||
*
|
||||
* Will add MyObjectPrivate as the private data to any instance of the MyObject
|
||||
* type.
|
||||
* Will add `MyObjectPrivate` as the private data to any instance of the
|
||||
* `MyObject` type.
|
||||
*
|
||||
* G_DEFINE_TYPE_* macros will automatically create a private function
|
||||
* `G_DEFINE_TYPE_*` macros will automatically create a private function
|
||||
* based on the arguments to this macro, which can be used to safely
|
||||
* retrieve the private data from an instance of the type; for instance:
|
||||
*
|
||||
|
|
@ -1877,7 +1880,7 @@ guint g_type_get_type_registration_serial (void);
|
|||
* }
|
||||
* ]|
|
||||
*
|
||||
* Note that this macro can only be used together with the G_DEFINE_TYPE_*
|
||||
* Note that this macro can only be used together with the `G_DEFINE_TYPE_*`
|
||||
* macros, since it depends on variable names from those macros.
|
||||
*
|
||||
* Also note that private structs added with these macros must have a struct
|
||||
|
|
@ -1902,7 +1905,7 @@ guint g_type_get_type_registration_serial (void);
|
|||
* Evaluates to the offset of the @field inside the instance private data
|
||||
* structure for @TypeName.
|
||||
*
|
||||
* Note that this macro can only be used together with the G_DEFINE_TYPE_*
|
||||
* Note that this macro can only be used together with the `G_DEFINE_TYPE_*`
|
||||
* and G_ADD_PRIVATE() macros, since it depends on variable names from
|
||||
* those macros.
|
||||
*
|
||||
|
|
@ -1920,7 +1923,7 @@ guint g_type_get_type_registration_serial (void);
|
|||
* Evaluates to a pointer to the @field_name inside the @inst private data
|
||||
* structure for @TypeName.
|
||||
*
|
||||
* Note that this macro can only be used together with the G_DEFINE_TYPE_*
|
||||
* Note that this macro can only be used together with the `G_DEFINE_TYPE_*`
|
||||
* and G_ADD_PRIVATE() macros, since it depends on variable names from
|
||||
* those macros.
|
||||
*
|
||||
|
|
@ -1939,7 +1942,7 @@ guint g_type_get_type_registration_serial (void);
|
|||
* Evaluates to the @field_name inside the @inst private data
|
||||
* structure for @TypeName.
|
||||
*
|
||||
* Note that this macro can only be used together with the G_DEFINE_TYPE_*
|
||||
* Note that this macro can only be used together with the `G_DEFINE_TYPE_*`
|
||||
* and G_ADD_PRIVATE() macros, since it depends on variable names from
|
||||
* those macros.
|
||||
*
|
||||
|
|
@ -1992,17 +1995,17 @@ type_name##_get_instance_private (TypeName *self) \
|
|||
GType \
|
||||
type_name##_get_type (void) \
|
||||
{ \
|
||||
static volatile gsize g_define_type_id__volatile = 0;
|
||||
static gsize static_g_define_type_id = 0;
|
||||
/* Prelude goes here */
|
||||
|
||||
/* Added for _G_DEFINE_TYPE_EXTENDED_WITH_PRELUDE */
|
||||
#define _G_DEFINE_TYPE_EXTENDED_BEGIN_REGISTER(TypeName, type_name, TYPE_PARENT, flags) \
|
||||
if (g_once_init_enter (&g_define_type_id__volatile)) \
|
||||
if (g_once_init_enter (&static_g_define_type_id)) \
|
||||
{ \
|
||||
GType g_define_type_id = type_name##_get_type_once (); \
|
||||
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \
|
||||
g_once_init_leave (&static_g_define_type_id, g_define_type_id); \
|
||||
} \
|
||||
return g_define_type_id__volatile; \
|
||||
return static_g_define_type_id; \
|
||||
} /* closes type_name##_get_type() */ \
|
||||
\
|
||||
G_GNUC_NO_INLINE \
|
||||
|
|
@ -2038,8 +2041,8 @@ static void type_name##_default_init (TypeName##Interface *klass); \
|
|||
GType \
|
||||
type_name##_get_type (void) \
|
||||
{ \
|
||||
static volatile gsize g_define_type_id__volatile = 0; \
|
||||
if (g_once_init_enter (&g_define_type_id__volatile)) \
|
||||
static gsize static_g_define_type_id = 0; \
|
||||
if (g_once_init_enter (&static_g_define_type_id)) \
|
||||
{ \
|
||||
GType g_define_type_id = \
|
||||
g_type_register_static_simple (G_TYPE_INTERFACE, \
|
||||
|
|
@ -2055,16 +2058,16 @@ type_name##_get_type (void) \
|
|||
#define _G_DEFINE_INTERFACE_EXTENDED_END() \
|
||||
/* following custom code */ \
|
||||
} \
|
||||
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \
|
||||
g_once_init_leave (&static_g_define_type_id, g_define_type_id); \
|
||||
} \
|
||||
return g_define_type_id__volatile; \
|
||||
return static_g_define_type_id; \
|
||||
} /* closes type_name##_get_type() */
|
||||
|
||||
/**
|
||||
* G_DEFINE_BOXED_TYPE:
|
||||
* @TypeName: The name of the new type, in Camel case
|
||||
* @type_name: The name of the new type, in lowercase, with words
|
||||
* separated by '_'
|
||||
* separated by `_`
|
||||
* @copy_func: the #GBoxedCopyFunc for the new type
|
||||
* @free_func: the #GBoxedFreeFunc for the new type
|
||||
*
|
||||
|
|
@ -2078,14 +2081,14 @@ type_name##_get_type (void) \
|
|||
* G_DEFINE_BOXED_TYPE_WITH_CODE:
|
||||
* @TypeName: The name of the new type, in Camel case
|
||||
* @type_name: The name of the new type, in lowercase, with words
|
||||
* separated by '_'
|
||||
* separated by `_`
|
||||
* @copy_func: the #GBoxedCopyFunc for the new type
|
||||
* @free_func: the #GBoxedFreeFunc for the new type
|
||||
* @_C_: Custom code that gets inserted in the *_get_type() function
|
||||
* @_C_: Custom code that gets inserted in the `*_get_type()` function
|
||||
*
|
||||
* A convenience macro for boxed type implementations.
|
||||
* Similar to G_DEFINE_BOXED_TYPE(), but allows to insert custom code into the
|
||||
* type_name_get_type() function, e.g. to register value transformations with
|
||||
* `type_name_get_type()` function, e.g. to register value transformations with
|
||||
* g_value_register_transform_func(), for instance:
|
||||
*
|
||||
* |[<!-- language="C" -->
|
||||
|
|
@ -2112,13 +2115,13 @@ static GType type_name##_get_type_once (void); \
|
|||
GType \
|
||||
type_name##_get_type (void) \
|
||||
{ \
|
||||
static volatile gsize g_define_type_id__volatile = 0; \
|
||||
if (g_once_init_enter (&g_define_type_id__volatile)) \
|
||||
static gsize static_g_define_type_id = 0; \
|
||||
if (g_once_init_enter (&static_g_define_type_id)) \
|
||||
{ \
|
||||
GType g_define_type_id = type_name##_get_type_once (); \
|
||||
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \
|
||||
g_once_init_leave (&static_g_define_type_id, g_define_type_id); \
|
||||
} \
|
||||
return g_define_type_id__volatile; \
|
||||
return static_g_define_type_id; \
|
||||
} \
|
||||
\
|
||||
G_GNUC_NO_INLINE \
|
||||
|
|
@ -2149,13 +2152,13 @@ static GType type_name##_get_type_once (void); \
|
|||
GType \
|
||||
type_name##_get_type (void) \
|
||||
{ \
|
||||
static volatile gsize g_define_type_id__volatile = 0; \
|
||||
if (g_once_init_enter (&g_define_type_id__volatile)) \
|
||||
static gsize static_g_define_type_id = 0; \
|
||||
if (g_once_init_enter (&static_g_define_type_id)) \
|
||||
{ \
|
||||
GType g_define_type_id = type_name##_get_type_once (); \
|
||||
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \
|
||||
g_once_init_leave (&static_g_define_type_id, g_define_type_id); \
|
||||
} \
|
||||
return g_define_type_id__volatile; \
|
||||
return static_g_define_type_id; \
|
||||
} \
|
||||
\
|
||||
G_GNUC_NO_INLINE \
|
||||
|
|
@ -2173,10 +2176,10 @@ type_name##_get_type_once (void) \
|
|||
* G_DEFINE_POINTER_TYPE:
|
||||
* @TypeName: The name of the new type, in Camel case
|
||||
* @type_name: The name of the new type, in lowercase, with words
|
||||
* separated by '_'
|
||||
* separated by `_`
|
||||
*
|
||||
* A convenience macro for pointer type implementations, which defines a
|
||||
* type_name_get_type() function registering the pointer type.
|
||||
* `type_name_get_type()` function registering the pointer type.
|
||||
*
|
||||
* Since: 2.26
|
||||
*/
|
||||
|
|
@ -2185,12 +2188,12 @@ type_name##_get_type_once (void) \
|
|||
* G_DEFINE_POINTER_TYPE_WITH_CODE:
|
||||
* @TypeName: The name of the new type, in Camel case
|
||||
* @type_name: The name of the new type, in lowercase, with words
|
||||
* separated by '_'
|
||||
* @_C_: Custom code that gets inserted in the *_get_type() function
|
||||
* separated by `_`
|
||||
* @_C_: Custom code that gets inserted in the `*_get_type()` function
|
||||
*
|
||||
* A convenience macro for pointer type implementations.
|
||||
* Similar to G_DEFINE_POINTER_TYPE(), but allows to insert
|
||||
* custom code into the type_name_get_type() function.
|
||||
* custom code into the `type_name_get_type()` function.
|
||||
*
|
||||
* Since: 2.26
|
||||
*/
|
||||
|
|
@ -2202,13 +2205,13 @@ static GType type_name##_get_type_once (void); \
|
|||
GType \
|
||||
type_name##_get_type (void) \
|
||||
{ \
|
||||
static volatile gsize g_define_type_id__volatile = 0; \
|
||||
if (g_once_init_enter (&g_define_type_id__volatile)) \
|
||||
static gsize static_g_define_type_id = 0; \
|
||||
if (g_once_init_enter (&static_g_define_type_id)) \
|
||||
{ \
|
||||
GType g_define_type_id = type_name##_get_type_once (); \
|
||||
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \
|
||||
g_once_init_leave (&static_g_define_type_id, g_define_type_id); \
|
||||
} \
|
||||
return g_define_type_id__volatile; \
|
||||
return static_g_define_type_id; \
|
||||
} \
|
||||
\
|
||||
G_GNUC_NO_INLINE \
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ typedef void (*GTypePluginCompleteTypeInfo) (GTypePlugin *plugin,
|
|||
/**
|
||||
* GTypePluginCompleteInterfaceInfo:
|
||||
* @plugin: the #GTypePlugin
|
||||
* @instance_type: the #GType of an instantiable type to which the interface
|
||||
* @instance_type: the #GType of an instantiatable type to which the interface
|
||||
* is added
|
||||
* @interface_type: the #GType of the interface whose info is completed
|
||||
* @info: the #GInterfaceInfo to fill in
|
||||
|
|
|
|||
|
|
@ -0,0 +1,214 @@
|
|||
/* glibconfig.h
|
||||
*
|
||||
* This is a generated file. Please modify 'glibconfig.h.in'
|
||||
*/
|
||||
|
||||
#ifndef __GLIBCONFIG_H__
|
||||
#define __GLIBCONFIG_H__
|
||||
|
||||
#include <glib/gmacros.h>
|
||||
|
||||
#include <limits.h>
|
||||
#include <float.h>
|
||||
#define GLIB_HAVE_ALLOCA_H
|
||||
|
||||
/* Specifies that GLib's g_print*() functions wrap the
|
||||
* system printf functions. This is useful to know, for example,
|
||||
* when using glibc's register_printf_function().
|
||||
*/
|
||||
#define GLIB_USING_SYSTEM_PRINTF
|
||||
|
||||
#define GLIB_STATIC_COMPILATION 1
|
||||
#define GOBJECT_STATIC_COMPILATION 1
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define G_MINFLOAT FLT_MIN
|
||||
#define G_MAXFLOAT FLT_MAX
|
||||
#define G_MINDOUBLE DBL_MIN
|
||||
#define G_MAXDOUBLE DBL_MAX
|
||||
#define G_MINSHORT SHRT_MIN
|
||||
#define G_MAXSHORT SHRT_MAX
|
||||
#define G_MAXUSHORT USHRT_MAX
|
||||
#define G_MININT INT_MIN
|
||||
#define G_MAXINT INT_MAX
|
||||
#define G_MAXUINT UINT_MAX
|
||||
#define G_MINLONG LONG_MIN
|
||||
#define G_MAXLONG LONG_MAX
|
||||
#define G_MAXULONG ULONG_MAX
|
||||
|
||||
typedef signed char gint8;
|
||||
typedef unsigned char guint8;
|
||||
|
||||
typedef signed short gint16;
|
||||
typedef unsigned short guint16;
|
||||
|
||||
#define G_GINT16_MODIFIER "h"
|
||||
#define G_GINT16_FORMAT "hi"
|
||||
#define G_GUINT16_FORMAT "hu"
|
||||
|
||||
|
||||
typedef signed int gint32;
|
||||
typedef unsigned int guint32;
|
||||
|
||||
#define G_GINT32_MODIFIER ""
|
||||
#define G_GINT32_FORMAT "i"
|
||||
#define G_GUINT32_FORMAT "u"
|
||||
|
||||
|
||||
#define G_HAVE_GINT64 1 /* deprecated, always true */
|
||||
|
||||
G_GNUC_EXTENSION typedef signed long long gint64;
|
||||
G_GNUC_EXTENSION typedef unsigned long long guint64;
|
||||
|
||||
#define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL))
|
||||
#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL))
|
||||
|
||||
#define G_GINT64_MODIFIER "ll"
|
||||
#define G_GINT64_FORMAT "lli"
|
||||
#define G_GUINT64_FORMAT "llu"
|
||||
|
||||
|
||||
#define GLIB_SIZEOF_VOID_P 8
|
||||
#define GLIB_SIZEOF_LONG 8
|
||||
#define GLIB_SIZEOF_SIZE_T 8
|
||||
#define GLIB_SIZEOF_SSIZE_T 8
|
||||
|
||||
typedef signed long gssize;
|
||||
typedef unsigned long gsize;
|
||||
#define G_GSIZE_MODIFIER "l"
|
||||
#define G_GSSIZE_MODIFIER "l"
|
||||
#define G_GSIZE_FORMAT "lu"
|
||||
#define G_GSSIZE_FORMAT "li"
|
||||
|
||||
#define G_MAXSIZE G_MAXULONG
|
||||
#define G_MINSSIZE G_MINLONG
|
||||
#define G_MAXSSIZE G_MAXLONG
|
||||
|
||||
typedef gint64 goffset;
|
||||
#define G_MINOFFSET G_MININT64
|
||||
#define G_MAXOFFSET G_MAXINT64
|
||||
|
||||
#define G_GOFFSET_MODIFIER G_GINT64_MODIFIER
|
||||
#define G_GOFFSET_FORMAT G_GINT64_FORMAT
|
||||
#define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val)
|
||||
|
||||
#define G_POLLFD_FORMAT "%d"
|
||||
|
||||
#define GPOINTER_TO_INT(p) ((gint) (glong) (p))
|
||||
#define GPOINTER_TO_UINT(p) ((guint) (gulong) (p))
|
||||
|
||||
#define GINT_TO_POINTER(i) ((gpointer) (glong) (i))
|
||||
#define GUINT_TO_POINTER(u) ((gpointer) (gulong) (u))
|
||||
|
||||
typedef signed long gintptr;
|
||||
typedef unsigned long guintptr;
|
||||
|
||||
#define G_GINTPTR_MODIFIER "l"
|
||||
#define G_GINTPTR_FORMAT "li"
|
||||
#define G_GUINTPTR_FORMAT "lu"
|
||||
|
||||
#define GLIB_MAJOR_VERSION 2
|
||||
#define GLIB_MINOR_VERSION 68
|
||||
#define GLIB_MICRO_VERSION 3
|
||||
|
||||
#define G_OS_UNIX
|
||||
|
||||
#define G_VA_COPY va_copy
|
||||
|
||||
|
||||
#ifndef __cplusplus
|
||||
# define G_HAVE_ISO_VARARGS 1
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
# define G_HAVE_ISO_VARARGS 1
|
||||
#endif
|
||||
|
||||
/* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
|
||||
* is passed ISO vararg support is turned off, and there is no work
|
||||
* around to turn it on, so we unconditionally turn it off.
|
||||
*/
|
||||
#if __GNUC__ == 2 && __GNUC_MINOR__ == 95
|
||||
# undef G_HAVE_ISO_VARARGS
|
||||
#endif
|
||||
|
||||
#define G_HAVE_GROWING_STACK 0
|
||||
#define G_HAVE_GNUC_VISIBILITY 1
|
||||
|
||||
#ifndef _MSC_VER
|
||||
# define G_HAVE_GNUC_VARARGS 1
|
||||
#endif
|
||||
|
||||
#if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
|
||||
#define G_GNUC_INTERNAL __attribute__((visibility("hidden")))
|
||||
#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
|
||||
#define G_GNUC_INTERNAL __hidden
|
||||
#elif defined (__GNUC__) && defined (G_HAVE_GNUC_VISIBILITY)
|
||||
#define G_GNUC_INTERNAL __attribute__((visibility("hidden")))
|
||||
#else
|
||||
#define G_GNUC_INTERNAL
|
||||
#endif
|
||||
|
||||
#define G_THREADS_ENABLED
|
||||
#define G_THREADS_IMPL_POSIX
|
||||
|
||||
#define G_ATOMIC_LOCK_FREE
|
||||
|
||||
#define GINT16_TO_LE(val) ((gint16) (val))
|
||||
#define GUINT16_TO_LE(val) ((guint16) (val))
|
||||
#define GINT16_TO_BE(val) ((gint16) GUINT16_SWAP_LE_BE (val))
|
||||
#define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val))
|
||||
|
||||
#define GINT32_TO_LE(val) ((gint32) (val))
|
||||
#define GUINT32_TO_LE(val) ((guint32) (val))
|
||||
#define GINT32_TO_BE(val) ((gint32) GUINT32_SWAP_LE_BE (val))
|
||||
#define GUINT32_TO_BE(val) (GUINT32_SWAP_LE_BE (val))
|
||||
|
||||
#define GINT64_TO_LE(val) ((gint64) (val))
|
||||
#define GUINT64_TO_LE(val) ((guint64) (val))
|
||||
#define GINT64_TO_BE(val) ((gint64) GUINT64_SWAP_LE_BE (val))
|
||||
#define GUINT64_TO_BE(val) (GUINT64_SWAP_LE_BE (val))
|
||||
|
||||
#define GLONG_TO_LE(val) ((glong) GINT64_TO_LE (val))
|
||||
#define GULONG_TO_LE(val) ((gulong) GUINT64_TO_LE (val))
|
||||
#define GLONG_TO_BE(val) ((glong) GINT64_TO_BE (val))
|
||||
#define GULONG_TO_BE(val) ((gulong) GUINT64_TO_BE (val))
|
||||
#define GINT_TO_LE(val) ((gint) GINT32_TO_LE (val))
|
||||
#define GUINT_TO_LE(val) ((guint) GUINT32_TO_LE (val))
|
||||
#define GINT_TO_BE(val) ((gint) GINT32_TO_BE (val))
|
||||
#define GUINT_TO_BE(val) ((guint) GUINT32_TO_BE (val))
|
||||
#define GSIZE_TO_LE(val) ((gsize) GUINT64_TO_LE (val))
|
||||
#define GSSIZE_TO_LE(val) ((gssize) GINT64_TO_LE (val))
|
||||
#define GSIZE_TO_BE(val) ((gsize) GUINT64_TO_BE (val))
|
||||
#define GSSIZE_TO_BE(val) ((gssize) GINT64_TO_BE (val))
|
||||
#define G_BYTE_ORDER G_LITTLE_ENDIAN
|
||||
|
||||
#define GLIB_SYSDEF_POLLIN =1
|
||||
#define GLIB_SYSDEF_POLLOUT =4
|
||||
#define GLIB_SYSDEF_POLLPRI =2
|
||||
#define GLIB_SYSDEF_POLLHUP =16
|
||||
#define GLIB_SYSDEF_POLLERR =8
|
||||
#define GLIB_SYSDEF_POLLNVAL =32
|
||||
|
||||
#define G_MODULE_SUFFIX "so"
|
||||
|
||||
typedef int GPid;
|
||||
#define G_PID_FORMAT "i"
|
||||
|
||||
#define GLIB_SYSDEF_AF_UNIX 1
|
||||
#define GLIB_SYSDEF_AF_INET 2
|
||||
#define GLIB_SYSDEF_AF_INET6 30
|
||||
|
||||
#define GLIB_SYSDEF_MSG_OOB 1
|
||||
#define GLIB_SYSDEF_MSG_PEEK 2
|
||||
#define GLIB_SYSDEF_MSG_DONTROUTE 4
|
||||
|
||||
#define G_DIR_SEPARATOR '/'
|
||||
#define G_DIR_SEPARATOR_S "/"
|
||||
#define G_SEARCHPATH_SEPARATOR ':'
|
||||
#define G_SEARCHPATH_SEPARATOR_S ":"
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __GLIBCONFIG_H__ */
|
||||
|
|
@ -0,0 +1,215 @@
|
|||
/* glibconfig.h
|
||||
*
|
||||
* This is a generated file. Please modify 'glibconfig.h.in'
|
||||
*/
|
||||
|
||||
#ifndef __GLIBCONFIG_H__
|
||||
#define __GLIBCONFIG_H__
|
||||
|
||||
#include <glib/gmacros.h>
|
||||
|
||||
#include <limits.h>
|
||||
#include <float.h>
|
||||
#define GLIB_HAVE_ALLOCA_H
|
||||
|
||||
/* Specifies that GLib's g_print*() functions wrap the
|
||||
* system printf functions. This is useful to know, for example,
|
||||
* when using glibc's register_printf_function().
|
||||
*/
|
||||
#undef GLIB_USING_SYSTEM_PRINTF
|
||||
|
||||
#define GLIB_STATIC_COMPILATION 1
|
||||
#define GOBJECT_STATIC_COMPILATION 1
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define G_MINFLOAT FLT_MIN
|
||||
#define G_MAXFLOAT FLT_MAX
|
||||
#define G_MINDOUBLE DBL_MIN
|
||||
#define G_MAXDOUBLE DBL_MAX
|
||||
#define G_MINSHORT SHRT_MIN
|
||||
#define G_MAXSHORT SHRT_MAX
|
||||
#define G_MAXUSHORT USHRT_MAX
|
||||
#define G_MININT INT_MIN
|
||||
#define G_MAXINT INT_MAX
|
||||
#define G_MAXUINT UINT_MAX
|
||||
#define G_MINLONG LONG_MIN
|
||||
#define G_MAXLONG LONG_MAX
|
||||
#define G_MAXULONG ULONG_MAX
|
||||
|
||||
typedef signed char gint8;
|
||||
typedef unsigned char guint8;
|
||||
|
||||
typedef signed short gint16;
|
||||
typedef unsigned short guint16;
|
||||
|
||||
#define G_GINT16_MODIFIER "h"
|
||||
#define G_GINT16_FORMAT "hi"
|
||||
#define G_GUINT16_FORMAT "hu"
|
||||
|
||||
|
||||
typedef signed int gint32;
|
||||
typedef unsigned int guint32;
|
||||
|
||||
#define G_GINT32_MODIFIER ""
|
||||
#define G_GINT32_FORMAT "i"
|
||||
#define G_GUINT32_FORMAT "u"
|
||||
|
||||
|
||||
#define G_HAVE_GINT64 1 /* deprecated, always true */
|
||||
|
||||
G_GNUC_EXTENSION typedef signed long long gint64;
|
||||
G_GNUC_EXTENSION typedef unsigned long long guint64;
|
||||
|
||||
#define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL))
|
||||
#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL))
|
||||
|
||||
#define G_GINT64_MODIFIER "ll"
|
||||
#define G_GINT64_FORMAT "lli"
|
||||
#define G_GUINT64_FORMAT "llu"
|
||||
|
||||
|
||||
#define GLIB_SIZEOF_VOID_P 8
|
||||
#define GLIB_SIZEOF_LONG 8
|
||||
#define GLIB_SIZEOF_SIZE_T 8
|
||||
#define GLIB_SIZEOF_SSIZE_T 8
|
||||
|
||||
typedef signed long gssize;
|
||||
typedef unsigned long gsize;
|
||||
#define G_GSIZE_MODIFIER "l"
|
||||
#define G_GSSIZE_MODIFIER "l"
|
||||
#define G_GSIZE_FORMAT "lu"
|
||||
#define G_GSSIZE_FORMAT "li"
|
||||
|
||||
#define G_MAXSIZE G_MAXULONG
|
||||
#define G_MINSSIZE G_MINLONG
|
||||
#define G_MAXSSIZE G_MAXLONG
|
||||
|
||||
typedef gint64 goffset;
|
||||
#define G_MINOFFSET G_MININT64
|
||||
#define G_MAXOFFSET G_MAXINT64
|
||||
|
||||
#define G_GOFFSET_MODIFIER G_GINT64_MODIFIER
|
||||
#define G_GOFFSET_FORMAT G_GINT64_FORMAT
|
||||
#define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val)
|
||||
|
||||
#define G_POLLFD_FORMAT "%d"
|
||||
|
||||
#define GPOINTER_TO_INT(p) ((gint) (glong) (p))
|
||||
#define GPOINTER_TO_UINT(p) ((guint) (gulong) (p))
|
||||
|
||||
#define GINT_TO_POINTER(i) ((gpointer) (glong) (i))
|
||||
#define GUINT_TO_POINTER(u) ((gpointer) (gulong) (u))
|
||||
|
||||
typedef signed long gintptr;
|
||||
typedef unsigned long guintptr;
|
||||
|
||||
#define G_GINTPTR_MODIFIER "l"
|
||||
#define G_GINTPTR_FORMAT "li"
|
||||
#define G_GUINTPTR_FORMAT "lu"
|
||||
|
||||
#define GLIB_MAJOR_VERSION 2
|
||||
#define GLIB_MINOR_VERSION 68
|
||||
#define GLIB_MICRO_VERSION 3
|
||||
|
||||
#define G_OS_UNIX
|
||||
|
||||
#define G_VA_COPY va_copy
|
||||
#define G_VA_COPY_AS_ARRAY 1
|
||||
|
||||
|
||||
#ifndef __cplusplus
|
||||
# define G_HAVE_ISO_VARARGS 1
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
# define G_HAVE_ISO_VARARGS 1
|
||||
#endif
|
||||
|
||||
/* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
|
||||
* is passed ISO vararg support is turned off, and there is no work
|
||||
* around to turn it on, so we unconditionally turn it off.
|
||||
*/
|
||||
#if __GNUC__ == 2 && __GNUC_MINOR__ == 95
|
||||
# undef G_HAVE_ISO_VARARGS
|
||||
#endif
|
||||
|
||||
#define G_HAVE_GROWING_STACK 0
|
||||
#define G_HAVE_GNUC_VISIBILITY 1
|
||||
|
||||
#ifndef _MSC_VER
|
||||
# define G_HAVE_GNUC_VARARGS 1
|
||||
#endif
|
||||
|
||||
#if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
|
||||
#define G_GNUC_INTERNAL __attribute__((visibility("hidden")))
|
||||
#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
|
||||
#define G_GNUC_INTERNAL __hidden
|
||||
#elif defined (__GNUC__) && defined (G_HAVE_GNUC_VISIBILITY)
|
||||
#define G_GNUC_INTERNAL __attribute__((visibility("hidden")))
|
||||
#else
|
||||
#define G_GNUC_INTERNAL
|
||||
#endif
|
||||
|
||||
#define G_THREADS_ENABLED
|
||||
#define G_THREADS_IMPL_POSIX
|
||||
|
||||
#define G_ATOMIC_LOCK_FREE
|
||||
|
||||
#define GINT16_TO_LE(val) ((gint16) (val))
|
||||
#define GUINT16_TO_LE(val) ((guint16) (val))
|
||||
#define GINT16_TO_BE(val) ((gint16) GUINT16_SWAP_LE_BE (val))
|
||||
#define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val))
|
||||
|
||||
#define GINT32_TO_LE(val) ((gint32) (val))
|
||||
#define GUINT32_TO_LE(val) ((guint32) (val))
|
||||
#define GINT32_TO_BE(val) ((gint32) GUINT32_SWAP_LE_BE (val))
|
||||
#define GUINT32_TO_BE(val) (GUINT32_SWAP_LE_BE (val))
|
||||
|
||||
#define GINT64_TO_LE(val) ((gint64) (val))
|
||||
#define GUINT64_TO_LE(val) ((guint64) (val))
|
||||
#define GINT64_TO_BE(val) ((gint64) GUINT64_SWAP_LE_BE (val))
|
||||
#define GUINT64_TO_BE(val) (GUINT64_SWAP_LE_BE (val))
|
||||
|
||||
#define GLONG_TO_LE(val) ((glong) GINT64_TO_LE (val))
|
||||
#define GULONG_TO_LE(val) ((gulong) GUINT64_TO_LE (val))
|
||||
#define GLONG_TO_BE(val) ((glong) GINT64_TO_BE (val))
|
||||
#define GULONG_TO_BE(val) ((gulong) GUINT64_TO_BE (val))
|
||||
#define GINT_TO_LE(val) ((gint) GINT32_TO_LE (val))
|
||||
#define GUINT_TO_LE(val) ((guint) GUINT32_TO_LE (val))
|
||||
#define GINT_TO_BE(val) ((gint) GINT32_TO_BE (val))
|
||||
#define GUINT_TO_BE(val) ((guint) GUINT32_TO_BE (val))
|
||||
#define GSIZE_TO_LE(val) ((gsize) GUINT64_TO_LE (val))
|
||||
#define GSSIZE_TO_LE(val) ((gssize) GINT64_TO_LE (val))
|
||||
#define GSIZE_TO_BE(val) ((gsize) GUINT64_TO_BE (val))
|
||||
#define GSSIZE_TO_BE(val) ((gssize) GINT64_TO_BE (val))
|
||||
#define G_BYTE_ORDER G_LITTLE_ENDIAN
|
||||
|
||||
#define GLIB_SYSDEF_POLLIN =1
|
||||
#define GLIB_SYSDEF_POLLOUT =4
|
||||
#define GLIB_SYSDEF_POLLPRI =2
|
||||
#define GLIB_SYSDEF_POLLHUP =16
|
||||
#define GLIB_SYSDEF_POLLERR =8
|
||||
#define GLIB_SYSDEF_POLLNVAL =32
|
||||
|
||||
#define G_MODULE_SUFFIX "so"
|
||||
|
||||
typedef int GPid;
|
||||
#define G_PID_FORMAT "i"
|
||||
|
||||
#define GLIB_SYSDEF_AF_UNIX 1
|
||||
#define GLIB_SYSDEF_AF_INET 2
|
||||
#define GLIB_SYSDEF_AF_INET6 30
|
||||
|
||||
#define GLIB_SYSDEF_MSG_OOB 1
|
||||
#define GLIB_SYSDEF_MSG_PEEK 2
|
||||
#define GLIB_SYSDEF_MSG_DONTROUTE 4
|
||||
|
||||
#define G_DIR_SEPARATOR '/'
|
||||
#define G_DIR_SEPARATOR_S "/"
|
||||
#define G_SEARCHPATH_SEPARATOR ':'
|
||||
#define G_SEARCHPATH_SEPARATOR_S ":"
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __GLIBCONFIG_H__ */
|
||||
|
|
@ -1,215 +1,10 @@
|
|||
/* glibconfig.h
|
||||
*
|
||||
* This is a generated file. Please modify 'glibconfig.h.in'
|
||||
*/
|
||||
|
||||
#ifndef __GLIBCONFIG_H__
|
||||
#define __GLIBCONFIG_H__
|
||||
#pragma once
|
||||
|
||||
#include <glib/gmacros.h>
|
||||
|
||||
#include <limits.h>
|
||||
#include <float.h>
|
||||
#define GLIB_HAVE_ALLOCA_H
|
||||
|
||||
/* Specifies that GLib's g_print*() functions wrap the
|
||||
* system printf functions. This is useful to know, for example,
|
||||
* when using glibc's register_printf_function().
|
||||
*/
|
||||
#undef GLIB_USING_SYSTEM_PRINTF
|
||||
|
||||
#define GLIB_STATIC_COMPILATION 1
|
||||
#define GOBJECT_STATIC_COMPILATION 1
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define G_MINFLOAT FLT_MIN
|
||||
#define G_MAXFLOAT FLT_MAX
|
||||
#define G_MINDOUBLE DBL_MIN
|
||||
#define G_MAXDOUBLE DBL_MAX
|
||||
#define G_MINSHORT SHRT_MIN
|
||||
#define G_MAXSHORT SHRT_MAX
|
||||
#define G_MAXUSHORT USHRT_MAX
|
||||
#define G_MININT INT_MIN
|
||||
#define G_MAXINT INT_MAX
|
||||
#define G_MAXUINT UINT_MAX
|
||||
#define G_MINLONG LONG_MIN
|
||||
#define G_MAXLONG LONG_MAX
|
||||
#define G_MAXULONG ULONG_MAX
|
||||
|
||||
typedef signed char gint8;
|
||||
typedef unsigned char guint8;
|
||||
|
||||
typedef signed short gint16;
|
||||
typedef unsigned short guint16;
|
||||
|
||||
#define G_GINT16_MODIFIER "h"
|
||||
#define G_GINT16_FORMAT "hi"
|
||||
#define G_GUINT16_FORMAT "hu"
|
||||
|
||||
|
||||
typedef signed int gint32;
|
||||
typedef unsigned int guint32;
|
||||
|
||||
#define G_GINT32_MODIFIER ""
|
||||
#define G_GINT32_FORMAT "i"
|
||||
#define G_GUINT32_FORMAT "u"
|
||||
|
||||
|
||||
#define G_HAVE_GINT64 1 /* deprecated, always true */
|
||||
|
||||
G_GNUC_EXTENSION typedef signed long long gint64;
|
||||
G_GNUC_EXTENSION typedef unsigned long long guint64;
|
||||
|
||||
#define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL))
|
||||
#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL))
|
||||
|
||||
#define G_GINT64_MODIFIER "ll"
|
||||
#define G_GINT64_FORMAT "lli"
|
||||
#define G_GUINT64_FORMAT "llu"
|
||||
|
||||
|
||||
#define GLIB_SIZEOF_VOID_P 8
|
||||
#define GLIB_SIZEOF_LONG 8
|
||||
#define GLIB_SIZEOF_SIZE_T 8
|
||||
#define GLIB_SIZEOF_SSIZE_T 8
|
||||
|
||||
typedef signed long gssize;
|
||||
typedef unsigned long gsize;
|
||||
#define G_GSIZE_MODIFIER "l"
|
||||
#define G_GSSIZE_MODIFIER "l"
|
||||
#define G_GSIZE_FORMAT "lu"
|
||||
#define G_GSSIZE_FORMAT "li"
|
||||
|
||||
#define G_MAXSIZE G_MAXULONG
|
||||
#define G_MINSSIZE G_MINLONG
|
||||
#define G_MAXSSIZE G_MAXLONG
|
||||
|
||||
typedef gint64 goffset;
|
||||
#define G_MINOFFSET G_MININT64
|
||||
#define G_MAXOFFSET G_MAXINT64
|
||||
|
||||
#define G_GOFFSET_MODIFIER G_GINT64_MODIFIER
|
||||
#define G_GOFFSET_FORMAT G_GINT64_FORMAT
|
||||
#define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val)
|
||||
|
||||
#define G_POLLFD_FORMAT "%d"
|
||||
|
||||
#define GPOINTER_TO_INT(p) ((gint) (glong) (p))
|
||||
#define GPOINTER_TO_UINT(p) ((guint) (gulong) (p))
|
||||
|
||||
#define GINT_TO_POINTER(i) ((gpointer) (glong) (i))
|
||||
#define GUINT_TO_POINTER(u) ((gpointer) (gulong) (u))
|
||||
|
||||
typedef signed long gintptr;
|
||||
typedef unsigned long guintptr;
|
||||
|
||||
#define G_GINTPTR_MODIFIER "l"
|
||||
#define G_GINTPTR_FORMAT "li"
|
||||
#define G_GUINTPTR_FORMAT "lu"
|
||||
|
||||
#define GLIB_MAJOR_VERSION 2
|
||||
#define GLIB_MINOR_VERSION 66
|
||||
#define GLIB_MICRO_VERSION 4
|
||||
|
||||
#define G_OS_UNIX
|
||||
|
||||
#define G_VA_COPY va_copy
|
||||
#define G_VA_COPY_AS_ARRAY 1
|
||||
|
||||
|
||||
#ifndef __cplusplus
|
||||
# define G_HAVE_ISO_VARARGS 1
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
# define G_HAVE_ISO_VARARGS 1
|
||||
#endif
|
||||
|
||||
/* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
|
||||
* is passed ISO vararg support is turned off, and there is no work
|
||||
* around to turn it on, so we unconditionally turn it off.
|
||||
*/
|
||||
#if __GNUC__ == 2 && __GNUC_MINOR__ == 95
|
||||
# undef G_HAVE_ISO_VARARGS
|
||||
#endif
|
||||
|
||||
#define G_HAVE_GROWING_STACK 0
|
||||
#define G_HAVE_GNUC_VISIBILITY 1
|
||||
|
||||
#ifndef _MSC_VER
|
||||
# define G_HAVE_GNUC_VARARGS 1
|
||||
#endif
|
||||
|
||||
#if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
|
||||
#define G_GNUC_INTERNAL __attribute__((visibility("hidden")))
|
||||
#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
|
||||
#define G_GNUC_INTERNAL __hidden
|
||||
#elif defined (__GNUC__) && defined (G_HAVE_GNUC_VISIBILITY)
|
||||
#define G_GNUC_INTERNAL __attribute__((visibility("hidden")))
|
||||
#if defined(__x86_64__)
|
||||
# include "_aedi_x86_64_glibconfig.h"
|
||||
#elif defined(__aarch64__)
|
||||
# include "_aedi_arm64_glibconfig.h"
|
||||
#else
|
||||
#define G_GNUC_INTERNAL
|
||||
# error Unknown architecture
|
||||
#endif
|
||||
|
||||
#define G_THREADS_ENABLED
|
||||
#define G_THREADS_IMPL_POSIX
|
||||
|
||||
#define G_ATOMIC_LOCK_FREE
|
||||
|
||||
#define GINT16_TO_LE(val) ((gint16) (val))
|
||||
#define GUINT16_TO_LE(val) ((guint16) (val))
|
||||
#define GINT16_TO_BE(val) ((gint16) GUINT16_SWAP_LE_BE (val))
|
||||
#define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val))
|
||||
|
||||
#define GINT32_TO_LE(val) ((gint32) (val))
|
||||
#define GUINT32_TO_LE(val) ((guint32) (val))
|
||||
#define GINT32_TO_BE(val) ((gint32) GUINT32_SWAP_LE_BE (val))
|
||||
#define GUINT32_TO_BE(val) (GUINT32_SWAP_LE_BE (val))
|
||||
|
||||
#define GINT64_TO_LE(val) ((gint64) (val))
|
||||
#define GUINT64_TO_LE(val) ((guint64) (val))
|
||||
#define GINT64_TO_BE(val) ((gint64) GUINT64_SWAP_LE_BE (val))
|
||||
#define GUINT64_TO_BE(val) (GUINT64_SWAP_LE_BE (val))
|
||||
|
||||
#define GLONG_TO_LE(val) ((glong) GINT64_TO_LE (val))
|
||||
#define GULONG_TO_LE(val) ((gulong) GUINT64_TO_LE (val))
|
||||
#define GLONG_TO_BE(val) ((glong) GINT64_TO_BE (val))
|
||||
#define GULONG_TO_BE(val) ((gulong) GUINT64_TO_BE (val))
|
||||
#define GINT_TO_LE(val) ((gint) GINT32_TO_LE (val))
|
||||
#define GUINT_TO_LE(val) ((guint) GUINT32_TO_LE (val))
|
||||
#define GINT_TO_BE(val) ((gint) GINT32_TO_BE (val))
|
||||
#define GUINT_TO_BE(val) ((guint) GUINT32_TO_BE (val))
|
||||
#define GSIZE_TO_LE(val) ((gsize) GUINT64_TO_LE (val))
|
||||
#define GSSIZE_TO_LE(val) ((gssize) GINT64_TO_LE (val))
|
||||
#define GSIZE_TO_BE(val) ((gsize) GUINT64_TO_BE (val))
|
||||
#define GSSIZE_TO_BE(val) ((gssize) GINT64_TO_BE (val))
|
||||
#define G_BYTE_ORDER G_LITTLE_ENDIAN
|
||||
|
||||
#define GLIB_SYSDEF_POLLIN =1
|
||||
#define GLIB_SYSDEF_POLLOUT =4
|
||||
#define GLIB_SYSDEF_POLLPRI =2
|
||||
#define GLIB_SYSDEF_POLLHUP =16
|
||||
#define GLIB_SYSDEF_POLLERR =8
|
||||
#define GLIB_SYSDEF_POLLNVAL =32
|
||||
|
||||
#define G_MODULE_SUFFIX "so"
|
||||
|
||||
typedef int GPid;
|
||||
#define G_PID_FORMAT "i"
|
||||
|
||||
#define GLIB_SYSDEF_AF_UNIX 1
|
||||
#define GLIB_SYSDEF_AF_INET 2
|
||||
#define GLIB_SYSDEF_AF_INET6 30
|
||||
|
||||
#define GLIB_SYSDEF_MSG_OOB 1
|
||||
#define GLIB_SYSDEF_MSG_PEEK 2
|
||||
#define GLIB_SYSDEF_MSG_DONTROUTE 4
|
||||
|
||||
#define G_DIR_SEPARATOR '/'
|
||||
#define G_DIR_SEPARATOR_S "/"
|
||||
#define G_SEARCHPATH_SEPARATOR ':'
|
||||
#define G_SEARCHPATH_SEPARATOR_S ":"
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __GLIBCONFIG_H__ */
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,5 +1,6 @@
|
|||
prefix=
|
||||
libdir=${prefix}/lib
|
||||
exec_prefix=${prefix}
|
||||
libdir=${exec_prefix}/lib
|
||||
includedir=${prefix}/include
|
||||
|
||||
bindir=${prefix}/bin
|
||||
|
|
@ -9,8 +10,8 @@ glib_mkenums=${bindir}/glib-mkenums
|
|||
|
||||
Name: GLib
|
||||
Description: C Utility Library
|
||||
Version: 2.66.4
|
||||
Requires.private: libpcre >= 8.31
|
||||
Libs: -L${libdir} -lglib-2.0 -lintl -liconv
|
||||
Libs.private: -Wl,-framework,CoreFoundation -Wl,-framework,Carbon -Wl,-framework,Foundation -Wl,-framework,AppKit -lm
|
||||
Version: 2.68.3
|
||||
Requires: libpcre >= 8.31
|
||||
Libs: -L${libdir} -lglib-2.0 -lintl -liconv -lm
|
||||
Libs.private: -Wl,-framework,CoreFoundation -Wl,-framework,Carbon -Wl,-framework,Foundation -Wl,-framework,AppKit
|
||||
Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
prefix=
|
||||
libdir=${prefix}/lib
|
||||
exec_prefix=${prefix}
|
||||
libdir=${exec_prefix}/lib
|
||||
includedir=${prefix}/include
|
||||
|
||||
Name: GObject
|
||||
Description: GLib Type, Object, Parameter and Signal Library
|
||||
Version: 2.66.4
|
||||
Requires: glib-2.0
|
||||
Requires.private: libffi >= 3.0.0
|
||||
Libs: -L${libdir} -lgobject-2.0
|
||||
Libs.private: -lintl -liconv
|
||||
Version: 2.68.3
|
||||
Requires: glib-2.0, libffi >= 3.0.0
|
||||
Libs: -L${libdir} -lgobject-2.0 -lintl -liconv
|
||||
Cflags: -I${includedir}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
prefix=
|
||||
libdir=${prefix}/lib
|
||||
exec_prefix=${prefix}
|
||||
libdir=${exec_prefix}/lib
|
||||
includedir=${prefix}/include
|
||||
|
||||
Name: GThread
|
||||
Description: Thread support for GLib
|
||||
Version: 2.66.4
|
||||
Version: 2.68.3
|
||||
Requires: glib-2.0
|
||||
Libs: -L${libdir} -lgthread-2.0
|
||||
Libs.private: -lintl -liconv
|
||||
Libs: -L${libdir} -lgthread-2.0 -lintl -liconv
|
||||
Cflags: -I${includedir}
|
||||
|
|
|
|||
Loading…
Reference in New Issue