X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib.h;h=521cb8ff22a10cdb7c0ebec18d3b19fa200cc409;hb=caeb4053e935d384a1b5691f134ac568bc5d53d6;hp=72ccbfba66dbb3f60d3486d1aab4f791148355a2;hpb=4010a5acb2be1747e60a0e844a508dbf0f55a149;p=platform%2Fupstream%2Fglib.git diff --git a/glib.h b/glib.h index 72ccbfb..521cb8f 100644 --- a/glib.h +++ b/glib.h @@ -544,13 +544,6 @@ typedef unsigned short gushort; typedef unsigned long gulong; typedef unsigned int guint; -#define G_GSHORT_FORMAT "hi" -#define G_GUSHORT_FORMAT "hu" -#define G_GINT_FORMAT "i" -#define G_GUINT_FORMAT "u" -#define G_GLONG_FORMAT "li" -#define G_GULONG_FORMAT "lu" - typedef float gfloat; typedef double gdouble; @@ -941,6 +934,15 @@ struct _GTuples guint len; }; +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#include + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ /* IEEE Standard 754 Single Precision Storage Format (gfloat): * @@ -1470,19 +1472,32 @@ GLogLevelFlags g_log_set_always_fatal (GLogLevelFlags fatal_mask); #ifndef G_LOG_DOMAIN #define G_LOG_DOMAIN ((gchar*) 0) #endif /* G_LOG_DOMAIN */ -#ifdef __GNUC__ -#define g_error(format, args...) g_log (G_LOG_DOMAIN, \ - G_LOG_LEVEL_ERROR, \ - format, ##args) -#define g_message(format, args...) g_log (G_LOG_DOMAIN, \ - G_LOG_LEVEL_MESSAGE, \ - format, ##args) -#define g_critical(format, args...) g_log (G_LOG_DOMAIN, \ - G_LOG_LEVEL_CRITICAL, \ - format, ##args) -#define g_warning(format, args...) g_log (G_LOG_DOMAIN, \ - G_LOG_LEVEL_WARNING, \ - format, ##args) +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#define g_error(...) g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_ERROR, \ + __VA_ARGS__) +#define g_message(...) g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_MESSAGE, \ + __VA_ARGS__) +#define g_critical(...) g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_CRITICAL, \ + __VA_ARGS__) +#define g_warning(...) g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_WARNING, \ + __VA_ARGS__) +#elif defined (__GNUC__) +#define g_error(format...) g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_ERROR, \ + format) +#define g_message(format...) g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_MESSAGE, \ + format) +#define g_critical(format...) g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_CRITICAL, \ + format) +#define g_warning(format...) g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_WARNING, \ + format) #else /* !__GNUC__ */ static void g_error (const gchar *format, @@ -2059,8 +2074,8 @@ gboolean g_str_equal (gconstpointer v, guint g_str_hash (gconstpointer v); gint g_int_equal (gconstpointer v, - gconstpointer v2); -guint g_int_hash (gconstpointer v); + gconstpointer v2) G_GNUC_CONST; +guint g_int_hash (gconstpointer v) G_GNUC_CONST; /* This "hash" function will just return the key's adress as an * unsigned integer. Useful for hashing on plain adresses or @@ -2068,9 +2083,9 @@ guint g_int_hash (gconstpointer v); * passing NULL into g_hash_table_new() as GHashFunc has the * same effect as passing g_direct_hash(). */ -guint g_direct_hash (gconstpointer v); +guint g_direct_hash (gconstpointer v) G_GNUC_CONST; gint g_direct_equal (gconstpointer v, - gconstpointer v2); + gconstpointer v2) G_GNUC_CONST; /* Quarks (string<->id association) @@ -2078,7 +2093,7 @@ gint g_direct_equal (gconstpointer v, GQuark g_quark_try_string (const gchar *string); GQuark g_quark_from_static_string (const gchar *string); GQuark g_quark_from_string (const gchar *string); -gchar* g_quark_to_string (GQuark quark); +gchar* g_quark_to_string (GQuark quark) G_GNUC_CONST; /* Keyed Data List @@ -2555,11 +2570,11 @@ void g_date_add_years (GDate *date, guint n_years); void g_date_subtract_years (GDate *date, guint n_years); -gboolean g_date_is_leap_year (GDateYear year); +gboolean g_date_is_leap_year (GDateYear year) G_GNUC_CONST; guint8 g_date_days_in_month (GDateMonth month, - GDateYear year); -guint8 g_date_monday_weeks_in_year (GDateYear year); -guint8 g_date_sunday_weeks_in_year (GDateYear year); + GDateYear year) G_GNUC_CONST; +guint8 g_date_monday_weeks_in_year (GDateYear year) G_GNUC_CONST; +guint8 g_date_sunday_weeks_in_year (GDateYear year) G_GNUC_CONST; /* qsort-friendly (with a cast...) */ gint g_date_compare (GDate *lhs, @@ -2668,7 +2683,7 @@ gdouble g_random_double_range (gdouble min, * next largest prime, or the highest it knows about which is about * MAXINT/4. */ -guint g_spaced_primes_closest (guint num); +guint g_spaced_primes_closest (guint num) G_GNUC_CONST; /* GIOChannel @@ -2908,34 +2923,47 @@ gint g_io_channel_unix_get_fd (GIOChannel *channel); #define G_WIN32_MSG_HANDLE 19981206 -/* This can be used to wait until a channel is readable. On Unix you - * would do a select() on the fd of the channel. This should probably - * be replaced by something for all platforms? +/* Use this to get a GPollFD from a GIOChannel, so that you can call + * g_io_channel_win32_poll(). After calling this you should only use + * g_io_channel_read() to read from the GIOChannel, i.e. never read() + * or recv() from the underlying file descriptor or SOCKET. */ -gint g_io_channel_win32_wait_for_condition (GIOChannel *channel, - GIOCondition condition, - gint timeout); +void g_io_channel_win32_make_pollfd (GIOChannel *channel, + GIOCondition condition, + GPollFD *fd); + +/* This can be used to wait a until at least one of the channels is readable. + * On Unix you would do a select() on the file descriptors of the channels. + * This should probably be available for all platforms? + */ +gint g_io_channel_win32_poll (GPollFD *fds, + gint n_fds, + gint timeout); /* This is used to add polling for Windows messages. GDK (GTk+) programs * should *not* use this. */ -void g_main_poll_win32_msg_add(gint priority, - GPollFD *fd, - guint hwnd); +void g_main_poll_win32_msg_add (gint priority, + GPollFD *fd, + guint hwnd); /* An IO channel for Windows messages for window handle hwnd. */ GIOChannel *g_io_channel_win32_new_messages (guint hwnd); /* An IO channel for C runtime (emulated Unix-like) file * descriptors. Identical to g_io_channel_unix_new above. + * After calling g_io_add_watch() on a IO channel returned + * by this function, you shouldn't call read() on the file + * descriptor. */ GIOChannel* g_io_channel_win32_new_fd (int fd); /* Get the C runtime file descriptor of a channel. */ gint g_io_channel_win32_get_fd (GIOChannel *channel); -/* An IO channel for a SOCK_STREAM winsock socket. The parameter should - * be a SOCKET. +/* An IO channel for a SOCK_STREAM winsock socket. The parameter + * should be a SOCKET. After calling g_io_add_watch() on a IO channel + * returned by this function, you shouldn't call recv() on the SOCKET. */ GIOChannel *g_io_channel_win32_new_stream_socket (int socket); @@ -3021,6 +3049,14 @@ gchar * g_win32_error_message (gint error); /* GLib Thread support */ +extern GQuark g_thread_error_quark(); +#define G_THREAD_ERROR g_thread_error_quark() + +typedef enum +{ + G_THREAD_ERROR_AGAIN /* Resource temporarily unavailable */ +} GThreadError; + typedef void (*GThreadFunc) (gpointer value); typedef enum @@ -3073,7 +3109,8 @@ struct _GThreadFunctions gboolean joinable, gboolean bound, GThreadPriority priority, - gpointer thread); + gpointer thread, + GError **error); void (*thread_yield) (void); void (*thread_join) (gpointer thread); void (*thread_exit) (void); @@ -3135,11 +3172,12 @@ GThread* g_thread_create (GThreadFunc thread_func, gulong stack_size, gboolean joinable, gboolean bound, - GThreadPriority priority); + GThreadPriority priority, + GError **error); GThread* g_thread_self (); -void g_thread_join (GThread* thread); -void g_thread_set_priority (GThread* thread, - GThreadPriority priority); +void g_thread_join (GThread *thread); +void g_thread_set_priority (GThread *thread, + GThreadPriority priority); /* GStaticMutexes can be statically initialized with the value * G_STATIC_MUTEX_INIT, and then they can directly be used, that is @@ -3339,20 +3377,23 @@ GThreadPool* g_thread_pool_new (GFunc thread_func, gboolean bound, GThreadPriority priority, gboolean exclusive, - gpointer user_data); + gpointer user_data, + GError **error); /* Push new data into the thread pool. This task is assigned to a thread later * (when the maximal number of threads is reached for that pool) or now * (otherwise). If necessary a new thread will be started. The function * returns immediatly */ void g_thread_pool_push (GThreadPool *pool, - gpointer data); + gpointer data, + GError **error); /* Set the number of threads, which can run concurrently for that pool, -1 * means no limit. 0 means has the effect, that the pool won't process * requests until the limit is set higher again */ void g_thread_pool_set_max_threads (GThreadPool *pool, - gint max_threads); + gint max_threads, + GError **error); gint g_thread_pool_get_max_threads (GThreadPool *pool); /* Get the number of threads assigned to that pool. This number doesn't @@ -3384,6 +3425,5 @@ void g_thread_pool_stop_unused_threads (void); #endif /* __cplusplus */ #include -#include #endif /* __G_LIB_H__ */