From 608a31b98e1420f487190871ee7312db2643d93d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 14 Mar 2005 04:26:57 +0000 Subject: [PATCH] Make PLT-reduction work with gcc4, and don't include everything in 2005-03-13 Matthias Clasen Make PLT-reduction work with gcc4, and don't include everything in galias.h: * glib/glib.symbols: Group symbols by header and source file. * glib/makegalias.pl: Protect definitions by the same preprocessor symbols used to guard the headers. Move the alias declarations to a separate file which is produced when calling makegalias.pl -def * glib/Makefile.am (galiasdef.c): Add a rule to generate this file. * glib/*.c: Include galias.h after the other GLib headers, include galiasdef.c at the bottom. --- ChangeLog | 17 + ChangeLog.pre-2-10 | 17 + ChangeLog.pre-2-12 | 17 + ChangeLog.pre-2-8 | 17 + glib/Makefile.am | 10 +- glib/abicheck.sh | 2 +- glib/garray.c | 12 +- glib/gasyncqueue.c | 4 +- glib/gatomic.c | 3 + glib/gbacktrace.c | 5 +- glib/gcache.c | 3 + glib/gcompletion.c | 6 +- glib/gconvert.c | 5 +- glib/gdataset.c | 8 +- glib/gdate.c | 6 +- glib/gdir.c | 6 +- glib/gerror.c | 5 +- glib/gfileutils.c | 6 +- glib/ghash.c | 5 +- glib/ghook.c | 5 +- glib/giochannel.c | 6 +- glib/giounix.c | 5 +- glib/giowin32.c | 6 +- glib/gkeyfile.c | 6 +- glib/glib.symbols | 905 ++++++++++++++++++++++++++++---------------- glib/glist.c | 4 +- glib/gmain.c | 6 +- glib/gmarkup.c | 5 +- glib/gmem.c | 4 +- glib/gmessages.c | 5 +- glib/gnode.c | 5 +- glib/goption.c | 6 +- glib/gpattern.c | 5 +- glib/gprimes.c | 5 +- glib/gprintf.c | 8 +- glib/gqsort.c | 5 +- glib/gqueue.c | 5 +- glib/grand.c | 5 +- glib/grel.c | 5 +- glib/gscanner.c | 5 +- glib/gshell.c | 5 +- glib/gslist.c | 5 +- glib/gspawn-win32.c | 5 +- glib/gspawn.c | 5 +- glib/gstdio.c | 6 +- glib/gstrfuncs.c | 6 +- glib/gstring.c | 5 +- glib/gthread.c | 5 +- glib/gthreadpool.c | 5 +- glib/gtimer.c | 5 +- glib/gtree.c | 5 +- glib/gunibreak.c | 5 +- glib/gunicollate.c | 5 +- glib/gunidecomp.c | 5 +- glib/guniprop.c | 5 +- glib/gutf8.c | 5 +- glib/gutils.c | 5 +- glib/gwin32.c | 5 +- glib/makegalias.pl | 64 ++-- 59 files changed, 912 insertions(+), 409 deletions(-) diff --git a/ChangeLog b/ChangeLog index bbd85e80..05170ede 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +005-03-13 Matthias Clasen + + Make PLT-reduction work with gcc4, and don't include + everything in galias.h: + + * glib/glib.symbols: Group symbols by header and source file. + * glib/makegalias.pl: Protect definitions by the same + preprocessor symbols used to guard the headers. Move + the alias declarations to a separate file which is + produced when calling makegalias.pl -def + * glib/Makefile.am (galiasdef.c): Add a rule to generate this + file. + * glib/*.c: Include galias.h after the other GLib headers, + include galiasdef.c at the bottom. + + * glib/glib.symbols: Add g_listenv and g_file_replace. + Fri Mar 11 23:51:12 2005 Soeren Sandmann * glib/gfileutils.c (write_to_temp_file): Don't try and generate diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bbd85e80..05170ede 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,20 @@ +005-03-13 Matthias Clasen + + Make PLT-reduction work with gcc4, and don't include + everything in galias.h: + + * glib/glib.symbols: Group symbols by header and source file. + * glib/makegalias.pl: Protect definitions by the same + preprocessor symbols used to guard the headers. Move + the alias declarations to a separate file which is + produced when calling makegalias.pl -def + * glib/Makefile.am (galiasdef.c): Add a rule to generate this + file. + * glib/*.c: Include galias.h after the other GLib headers, + include galiasdef.c at the bottom. + + * glib/glib.symbols: Add g_listenv and g_file_replace. + Fri Mar 11 23:51:12 2005 Soeren Sandmann * glib/gfileutils.c (write_to_temp_file): Don't try and generate diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index bbd85e80..05170ede 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,20 @@ +005-03-13 Matthias Clasen + + Make PLT-reduction work with gcc4, and don't include + everything in galias.h: + + * glib/glib.symbols: Group symbols by header and source file. + * glib/makegalias.pl: Protect definitions by the same + preprocessor symbols used to guard the headers. Move + the alias declarations to a separate file which is + produced when calling makegalias.pl -def + * glib/Makefile.am (galiasdef.c): Add a rule to generate this + file. + * glib/*.c: Include galias.h after the other GLib headers, + include galiasdef.c at the bottom. + + * glib/glib.symbols: Add g_listenv and g_file_replace. + Fri Mar 11 23:51:12 2005 Soeren Sandmann * glib/gfileutils.c (write_to_temp_file): Don't try and generate diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bbd85e80..05170ede 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,20 @@ +005-03-13 Matthias Clasen + + Make PLT-reduction work with gcc4, and don't include + everything in galias.h: + + * glib/glib.symbols: Group symbols by header and source file. + * glib/makegalias.pl: Protect definitions by the same + preprocessor symbols used to guard the headers. Move + the alias declarations to a separate file which is + produced when calling makegalias.pl -def + * glib/Makefile.am (galiasdef.c): Add a rule to generate this + file. + * glib/*.c: Include galias.h after the other GLib headers, + include galiasdef.c at the bottom. + + * glib/glib.symbols: Add g_listenv and g_file_replace. + Fri Mar 11 23:51:12 2005 Soeren Sandmann * glib/gfileutils.c (write_to_temp_file): Don't try and generate diff --git a/glib/Makefile.am b/glib/Makefile.am index d19c536b..de504e27 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -14,18 +14,21 @@ INCLUDES = -I$(top_srcdir) -DG_LOG_DOMAIN=\"GLib\" \ $(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION glib.def: glib.symbols - (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > glib.def + (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > glib.def galias.h: glib.symbols $(PERL) $(srcdir)/makegalias.pl < $(srcdir)/glib.symbols > galias.h +galiasdef.c: glib.symbols + $(PERL) $(srcdir)/makegalias.pl -def < $(srcdir)/glib.symbols > galiasdef.c + if OS_LINUX if HAVE_GNUC_VISIBILITY TESTS = abicheck.sh endif endif -BUILT_SOURCES = galias.h +BUILT_SOURCES = galias.h galiasdef.c EXTRA_DIST = \ makefile.msc.in \ @@ -39,7 +42,8 @@ EXTRA_DIST = \ BUILT_EXTRA_DIST = \ makefile.msc \ glib.rc \ - galias.h + galias.h \ + galiasdef.c lib_LTLIBRARIES = libglib-2.0.la diff --git a/glib/abicheck.sh b/glib/abicheck.sh index fc4ba1d8..65462a75 100755 --- a/glib/abicheck.sh +++ b/glib/abicheck.sh @@ -5,7 +5,7 @@ egrep '^#([^i]|if).*[^\]$' "${top_builddir:-..}/glibconfig.h" > glibconfig.cpp INCLUDES="-include ${top_builddir:-..}/config.h" INCLUDES="$INCLUDES -include glibconfig.cpp" -cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DG_STDIO_NO_WRAP_ON_UNIX $INCLUDES "${srcdir:-.}/glib.symbols" | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi +cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DG_STDIO_NO_WRAP_ON_UNIX -DALL_FILES $INCLUDES "${srcdir:-.}/glib.symbols" | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi rm glibconfig.cpp nm -D .libs/libglib-2.0.so | grep " T " | cut -d ' ' -f 3 | sort > actual-abi diff --git a/glib/garray.c b/glib/garray.c index 70a836a2..54ee05b0 100644 --- a/glib/garray.c +++ b/glib/garray.c @@ -32,8 +32,15 @@ #include #include + +#include "garray.h" + +#include "gmem.h" +#include "gthread.h" +#include "gmessages.h" +#include "gqsort.h" + #include "galias.h" -#include "glib.h" #define MIN_ARRAY_SIZE 16 @@ -750,3 +757,6 @@ g_byte_array_sort_with_data (GByteArray *array, { g_array_sort_with_data ((GArray *) array, compare_func, user_data); } + +#define __G_ARRAY_C__ +#include "galiasdef.c" diff --git a/glib/gasyncqueue.c b/glib/gasyncqueue.c index 6efe379f..28babcee 100644 --- a/glib/gasyncqueue.c +++ b/glib/gasyncqueue.c @@ -26,8 +26,8 @@ #include "config.h" -#include "galias.h" #include "glib.h" +#include "galias.h" struct _GAsyncQueue @@ -444,3 +444,5 @@ g_async_queue_length_unlocked (GAsyncQueue* queue) return queue->queue->length - queue->waiting_threads; } +#define __G_ASYNCQUEUE_C__ +#include "galiasdef.c" diff --git a/glib/gatomic.c b/glib/gatomic.c index d4af3899..06d7ee6e 100644 --- a/glib/gatomic.c +++ b/glib/gatomic.c @@ -646,3 +646,6 @@ _g_atomic_thread_init (void) g_atomic_mutex = g_mutex_new (); #endif /* DEFINE_WITH_MUTEXES */ } + +#define IN_FILE_gatomic 1 +#include "galiasdef.c" diff --git a/glib/gbacktrace.c b/glib/gbacktrace.c index ccd1f827..64c412e2 100644 --- a/glib/gbacktrace.c +++ b/glib/gbacktrace.c @@ -35,7 +35,6 @@ #include #include #include -#include "galias.h" #include "glib.h" #include "gprintfint.h" @@ -76,6 +75,7 @@ # endif #endif +#include "galias.h" #ifndef G_OS_WIN32 static void stack_trace (char **args); @@ -302,3 +302,6 @@ stack_trace (char **args) } #endif /* !G_OS_WIN32 */ + +#define __G_BACKTRACE_C__ +#include "galiasdef.c" diff --git a/glib/gcache.c b/glib/gcache.c index 6d506d80..f92276b7 100644 --- a/glib/gcache.c +++ b/glib/gcache.c @@ -213,3 +213,6 @@ g_cache_node_destroy (GCacheNode *node) g_mem_chunk_free (node_mem_chunk, node); G_UNLOCK (node_mem_chunk); } + +#define IN_FILE_gcache 1 +#include "galiasdef.c" diff --git a/glib/gcompletion.c b/glib/gcompletion.c index 5bd8007e..ac249798 100644 --- a/glib/gcompletion.c +++ b/glib/gcompletion.c @@ -32,9 +32,8 @@ #include -#include "galias.h" #include "glib.h" - +#include "galias.h" static void completion_check_cache (GCompletion* cmp, gchar** new_prefix); @@ -346,3 +345,6 @@ main (int argc, return 0; } #endif + +#define __G_COMPLETION_C__ +#include "galiasdef.c" diff --git a/glib/gconvert.c b/glib/gconvert.c index dc065606..d9561e4f 100644 --- a/glib/gconvert.c +++ b/glib/gconvert.c @@ -28,7 +28,6 @@ #include #include -#include "galias.h" #include "glib.h" #include "gprintfint.h" #include "gthreadinit.h" @@ -48,6 +47,8 @@ #error GNU libiconv not in use but included iconv.h is from libiconv #endif +#include "galias.h" + GQuark g_convert_error_quark (void) { @@ -2003,3 +2004,5 @@ g_filename_display_name (const gchar *filename) return display_name; } +#define __G_CONVERT_C__ +#include "galiasdef.c" diff --git a/glib/gdataset.c b/glib/gdataset.c index 9aed3a6d..4aecff7f 100644 --- a/glib/gdataset.c +++ b/glib/gdataset.c @@ -34,8 +34,9 @@ #include "config.h" #include -#include "galias.h" + #include "glib.h" +#include "galias.h" /* --- defines --- */ @@ -544,7 +545,7 @@ g_data_initialize (void) } GQuark -g_quark_try_string (const gchar *string) +IA__g_quark_try_string (const gchar *string) { GQuark quark = 0; g_return_val_if_fail (string != NULL, 0); @@ -631,3 +632,6 @@ g_quark_new (gchar *string) return quark; } + +#define __G_DATASET_C__ +#include "galiasdef.c" diff --git a/glib/gdate.c b/glib/gdate.c index b4297a79..4e204f17 100644 --- a/glib/gdate.c +++ b/glib/gdate.c @@ -35,7 +35,6 @@ /* #define DEBUG_MSG(args) g_message args ; */ #endif -#include "galias.h" #include "glib.h" #include @@ -43,6 +42,8 @@ #include #include +#include "galias.h" + GDate* g_date_new (void) { @@ -1467,3 +1468,6 @@ g_date_strftime (gchar *s, return retval; } +#define __G_DATE_C__ +#include "galiasdef.c" + diff --git a/glib/gdir.c b/glib/gdir.c index 67358f78..9d205ec1 100644 --- a/glib/gdir.c +++ b/glib/gdir.c @@ -32,12 +32,13 @@ #include #endif -#include "galias.h" #include "glib.h" #include "gdir.h" #include "glibintl.h" +#include "galias.h" + struct _GDir { union { @@ -343,3 +344,6 @@ g_dir_close (GDir *dir) closedir (dir->u.dirp); g_free (dir); } + +#define __G_DIR_C__ +#include "galiasdef.c" diff --git a/glib/gerror.c b/glib/gerror.c index 412e5a44..495e40ff 100644 --- a/glib/gerror.c +++ b/glib/gerror.c @@ -26,8 +26,8 @@ #include "config.h" -#include "galias.h" #include "glib.h" +#include "galias.h" static GError* @@ -256,3 +256,6 @@ g_clear_error (GError **err) *err = NULL; } } + +#define __G_ERROR_C__ +#include "galiasdef.c" diff --git a/glib/gfileutils.c b/glib/gfileutils.c index f9f67561..05cd33e2 100644 --- a/glib/gfileutils.c +++ b/glib/gfileutils.c @@ -20,7 +20,6 @@ #include "config.h" -#include "galias.h" #include "glib.h" #include @@ -53,6 +52,8 @@ #include "gstdio.h" #include "glibintl.h" +#include "galias.h" + /** * g_file_test: * @filename: a filename to test in the GLib file name encoding @@ -1721,3 +1722,6 @@ g_file_read_link (const gchar *filename, return NULL; #endif } + +#define __G_FILEUTILS_C__ +#include "galiasdef.c" diff --git a/glib/ghash.c b/glib/ghash.c index a979329c..0fac55e8 100644 --- a/glib/ghash.c +++ b/glib/ghash.c @@ -30,8 +30,8 @@ #include "config.h" -#include "galias.h" #include "glib.h" +#include "galias.h" #define HASH_TABLE_MIN_SIZE 11 @@ -759,3 +759,6 @@ g_hash_nodes_destroy (GHashNode *hash_node, } #endif } + +#define __G_HASH_C__ +#include "galiasdef.c" diff --git a/glib/ghook.c b/glib/ghook.c index b01b8307..88ff448a 100644 --- a/glib/ghook.c +++ b/glib/ghook.c @@ -33,8 +33,8 @@ #include "config.h" -#include "galias.h" #include "glib.h" +#include "galias.h" /* --- defines --- */ @@ -645,3 +645,6 @@ g_hook_compare_ids (GHook *new_hook, return 0; } + +#define __G_HOOK_C__ +#include "galiasdef.c" diff --git a/glib/giochannel.c b/glib/giochannel.c index bb0e9d6a..0e898bac 100644 --- a/glib/giochannel.c +++ b/glib/giochannel.c @@ -42,13 +42,14 @@ #undef G_DISABLE_DEPRECATED -#include "galias.h" #include "glib.h" #include "giochannel.h" #include "glibintl.h" +#include "galias.h" + #define G_IO_NICE_BUF_SIZE 1024 /* This needs to be as wide as the largest character in any possible encoding */ @@ -2301,3 +2302,6 @@ g_io_channel_error_quark (void) return q; } + +#define __G_IOCHANNEL_C__ +#include "galiasdef.c" diff --git a/glib/giounix.c b/glib/giounix.c index 44e02941..d2a7b34d 100644 --- a/glib/giounix.c +++ b/glib/giounix.c @@ -43,8 +43,8 @@ #include #include -#include "galias.h" #include "glib.h" +#include "galias.h" /* * Unix IO Channels @@ -596,3 +596,6 @@ g_io_channel_unix_get_fd (GIOChannel *channel) GIOUnixChannel *unix_channel = (GIOUnixChannel *)channel; return unix_channel->fd; } + +#define __G_IO_UNIX_C__ +#include "galiasdef.c" diff --git a/glib/giowin32.c b/glib/giowin32.c index 43f0b1e9..9d541870 100644 --- a/glib/giowin32.c +++ b/glib/giowin32.c @@ -34,7 +34,6 @@ #include "config.h" -#include "galias.h" #include "glib.h" #include @@ -49,6 +48,8 @@ #include "gstdio.h" #include "glibintl.h" +#include "galias.h" + typedef struct _GIOWin32Channel GIOWin32Channel; typedef struct _GIOWin32Watch GIOWin32Watch; @@ -1713,3 +1714,6 @@ g_io_channel_win32_new_stream_socket (int socket) { return g_io_channel_win32_new_socket (socket); } + +#define __G_IO_WIN32_C__ +#include "galiasdef.c" diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c index 4e65c3d0..ce4b386e 100644 --- a/glib/gkeyfile.c +++ b/glib/gkeyfile.c @@ -22,7 +22,6 @@ */ #include "config.h" -#include "galias.h" #include "gkeyfile.h" @@ -61,6 +60,8 @@ #include "gstrfuncs.h" #include "gutils.h" +#include "galias.h" + typedef struct _GKeyFileGroup GKeyFileGroup; struct _GKeyFile @@ -3274,4 +3275,5 @@ g_key_file_parse_comment_as_value (GKeyFile *key_file, return value; } - +#define __G_KEY_FILE_C__ +#include "galiasdef.c" diff --git a/glib/glib.symbols b/glib/glib.symbols index 838ecbdd..1bb49eb2 100644 --- a/glib/glib.symbols +++ b/glib/glib.symbols @@ -1,5 +1,18 @@ -g_allocator_free -g_allocator_new +/* This file lists all exported symbols. It is used to generate + * the glib.def file used to control exports on Windows and the + * galias.h/galiasdef.c files used to avoid PLT entries for + * internal uses of exported functions (see makegalias.pl). + * + * Every symbol must be included in the right + * #ifdef IN_HEADER(sym) #endif and + * #ifdef IN_FILE(sym) #endif sections. + */ +#ifdef ALL_FILES +#define IN_FILE(x) 1 +#define IN_HEADER(x) 1 +#endif +#if IN_HEADER(__G_ARRAY_H__) +#if IN_FILE(__G_ARRAY_C__) g_array_append_vals g_array_free g_array_insert_vals @@ -12,19 +25,35 @@ g_array_set_size g_array_sized_new g_array_sort g_array_sort_with_data -g_ascii_digit_value G_GNUC_CONST -g_ascii_dtostr -g_ascii_formatd -g_ascii_strcasecmp -g_ascii_strdown G_GNUC_MALLOC -g_ascii_strncasecmp -g_ascii_strtod -g_ascii_strtoull -g_ascii_strup G_GNUC_MALLOC -g_ascii_tolower G_GNUC_CONST -g_ascii_toupper G_GNUC_CONST -g_ascii_xdigit_value G_GNUC_CONST -g_assert_warning G_GNUC_NORETURN +g_byte_array_append +g_byte_array_free +g_byte_array_new +g_byte_array_prepend +g_byte_array_remove_index +g_byte_array_remove_index_fast +g_byte_array_remove_range +g_byte_array_set_size +g_byte_array_sized_new +g_byte_array_sort +g_byte_array_sort_with_data +g_ptr_array_add +g_ptr_array_foreach +g_ptr_array_free +g_ptr_array_new +g_ptr_array_remove +g_ptr_array_remove_fast +g_ptr_array_remove_index +g_ptr_array_remove_index_fast +g_ptr_array_remove_range +g_ptr_array_set_size +g_ptr_array_sized_new +g_ptr_array_sort +g_ptr_array_sort_with_data +#endif +#endif + +#if IN_HEADER(__G_ASYNCQUEUE_H__) +#if IN_FILE(__G_ASYNCQUEUE_C__) g_async_queue_length g_async_queue_length_unlocked g_async_queue_lock @@ -34,15 +63,21 @@ g_async_queue_pop_unlocked g_async_queue_push g_async_queue_push_unlocked g_async_queue_ref -g_async_queue_ref_unlocked g_async_queue_timed_pop g_async_queue_timed_pop_unlocked g_async_queue_try_pop g_async_queue_try_pop_unlocked g_async_queue_unlock g_async_queue_unref +#ifndef G_DISABLE_DEPRECATED +g_async_queue_ref_unlocked g_async_queue_unref_and_unlock -g_atexit +#endif +#endif +#endif + +#if IN_HEADER(__G_ATOMIC_H__) +#if IN_FILE(__G_ATOMIC_C__) g_atomic_int_add g_atomic_int_compare_and_exchange g_atomic_int_exchange_and_add @@ -51,31 +86,29 @@ g_atomic_pointer_compare_and_exchange g_atomic_int_get g_atomic_pointer_get #endif -g_basename -g_blow_chunks -g_build_filename G_GNUC_NULL_TERMINATED -g_build_path G_GNUC_NULL_TERMINATED -g_byte_array_append -g_byte_array_free -g_byte_array_new -g_byte_array_prepend -g_byte_array_remove_index -g_byte_array_remove_index_fast -g_byte_array_remove_range -g_byte_array_set_size -g_byte_array_sized_new -g_byte_array_sort -g_byte_array_sort_with_data +#endif +#endif + +#if IN_HEADER(__G_BACKTRACE_H__) +#if IN_FILE(__G_BACKTRACE_C__) +g_on_error_query +g_on_error_stack_trace +#endif +#endif + +#if IN_HEADER(__G_CACHE_H__) +#if IN_FILE(__G_CACHE_C__) g_cache_destroy g_cache_insert g_cache_key_foreach g_cache_new g_cache_remove g_cache_value_foreach -g_child_watch_add -g_child_watch_add_full -g_child_watch_source_new -g_clear_error +#endif +#endif + +#if IN_HEADER(__G_COMPLETION_H__) +#if IN_FILE(__G_COMPLETION_C__) g_completion_add_items g_completion_clear_items g_completion_complete @@ -84,10 +117,39 @@ g_completion_free g_completion_new g_completion_remove_items g_completion_set_compare +#endif +#endif + +#if IN_HEADER(__G_CONVERT_H__) +#if IN_FILE(__G_CONVERT_C__) +g_get_filename_charsets g_convert G_GNUC_MALLOC g_convert_error_quark g_convert_with_fallback G_GNUC_MALLOC g_convert_with_iconv G_GNUC_MALLOC +g_iconv +g_iconv_close +g_iconv_open +g_locale_from_utf8 G_GNUC_MALLOC +g_locale_to_utf8 G_GNUC_MALLOC +g_filename_display_name G_GNUC_MALLOC +g_filename_display_basename G_GNUC_MALLOC +g_filename_from_uri PRIVATE G_GNUC_MALLOC +g_filename_from_utf8 PRIVATE G_GNUC_MALLOC +g_filename_to_uri PRIVATE G_GNUC_MALLOC +g_filename_to_utf8 PRIVATE G_GNUC_MALLOC +#ifdef G_OS_WIN32 +g_filename_from_uri_utf8 G_GNUC_MALLOC +g_filename_from_utf8_utf8 +g_filename_to_uri_utf8 G_GNUC_MALLOC +g_filename_to_utf8_utf8 +#endif +g_uri_list_extract_uris G_GNUC_MALLOC +#endif +#endif + +#if IN_HEADER(__G_DATASET_H__) +#if IN_FILE(__G_DATASET_C__) g_datalist_clear g_datalist_foreach g_datalist_id_get_data @@ -99,6 +161,15 @@ g_dataset_foreach g_dataset_id_get_data g_dataset_id_remove_no_notify g_dataset_id_set_data_full +g_quark_from_static_string +g_quark_from_string +g_quark_to_string G_GNUC_CONST +g_quark_try_string +#endif +#endif + +#if IN_HEADER(__G_DATE_H__) +#if IN_FILE(__G_DATE_C__) g_date_add_days g_date_add_months g_date_add_years @@ -145,98 +216,58 @@ g_date_valid_julian G_GNUC_CONST g_date_valid_month G_GNUC_CONST g_date_valid_weekday G_GNUC_CONST g_date_valid_year G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__G_DIR_H__) +#if IN_FILE(__G_DIR_C__) g_dir_close -g_direct_equal G_GNUC_CONST -g_direct_hash G_GNUC_CONST g_dir_open PRIVATE -#ifdef G_OS_WIN32 -g_dir_open_utf8 -#endif g_dir_read_name PRIVATE #ifdef G_OS_WIN32 +g_dir_open_utf8 g_dir_read_name_utf8 #endif g_dir_rewind +#endif +#endif + +#if IN_HEADER(__G_ERROR_H__) +#if IN_FILE(__G_ERROR_C__) +g_clear_error g_error_copy g_error_free g_error_matches g_error_new G_GNUC_PRINTF(3,4) g_error_new_literal +g_propagate_error +g_set_error G_GNUC_PRINTF(4,5) +#endif +#endif + +#if IN_HEADER(__G_FILEUTILS_H__) +#if IN_FILE(__G_FILEUTILS_C__) +g_build_filename G_GNUC_NULL_TERMINATED +g_build_path G_GNUC_NULL_TERMINATED g_file_error_from_errno g_file_error_quark g_file_get_contents PRIVATE -#ifdef G_OS_WIN32 -g_file_get_contents_utf8 -#endif -g_filename_display_name G_GNUC_MALLOC -g_filename_display_basename G_GNUC_MALLOC -g_filename_from_uri PRIVATE G_GNUC_MALLOC -#ifdef G_OS_WIN32 -g_filename_from_uri_utf8 G_GNUC_MALLOC -#endif -g_filename_from_utf8 PRIVATE G_GNUC_MALLOC -#ifdef G_OS_WIN32 -g_filename_from_utf8_utf8 -#endif -g_filename_to_uri PRIVATE G_GNUC_MALLOC -#ifdef G_OS_WIN32 -g_filename_to_uri_utf8 G_GNUC_MALLOC -#endif -g_filename_to_utf8 PRIVATE G_GNUC_MALLOC -#ifdef G_OS_WIN32 -g_filename_to_utf8_utf8 -#endif -g_file_open_tmp PRIVATE -#ifdef G_OS_WIN32 -g_file_open_tmp_utf8 -#endif -g_file_read_link g_file_replace +g_file_open_tmp PRIVATE g_file_test PRIVATE +g_file_read_link +g_mkstemp PRIVATE #ifdef G_OS_WIN32 +g_file_get_contents_utf8 +g_file_open_tmp_utf8 g_file_test_utf8 +g_mkstemp_utf8 #endif -g_find_program_in_path PRIVATE -#ifdef G_OS_WIN32 -g_find_program_in_path_utf8 -#endif -g_fprintf G_GNUC_PRINTF(2,3) -g_free -g_get_application_name -g_get_charset -g_get_current_dir PRIVATE -#ifdef G_OS_WIN32 -g_get_current_dir_utf8 -#endif -g_get_current_time -g_get_filename_charsets -g_getenv PRIVATE -#ifdef G_OS_WIN32 -g_getenv_utf8 -#endif -g_get_home_dir PRIVATE -#ifdef G_OS_WIN32 -g_get_home_dir_utf8 -#endif -g_get_language_names -g_get_prgname -g_get_real_name PRIVATE -#ifdef G_OS_WIN32 -g_get_real_name_utf8 -#endif -g_get_system_config_dirs -g_get_system_data_dirs -g_get_tmp_dir PRIVATE -#ifdef G_OS_WIN32 -g_get_tmp_dir_utf8 #endif -g_get_user_cache_dir -g_get_user_config_dir -g_get_user_data_dir -g_get_user_name PRIVATE -#ifdef G_OS_WIN32 -g_get_user_name_utf8 #endif + +#if IN_HEADER(__G_HASH_H__) +#if IN_FILE(__G_HASH_C__) g_hash_table_destroy g_hash_table_find g_hash_table_foreach @@ -251,6 +282,11 @@ g_hash_table_remove g_hash_table_replace g_hash_table_size g_hash_table_steal +#endif +#endif + +#if IN_HEADER(__G_HOOK_H__) +#if IN_FILE(__G_HOOK_C__) g_hook_alloc g_hook_compare_ids g_hook_destroy @@ -274,18 +310,14 @@ g_hook_next_valid g_hook_prepend g_hook_ref g_hook_unref -g_iconv -g_iconv_close -g_iconv_open -g_idle_add -g_idle_add_full -g_idle_remove_by_data -g_idle_source_new -g_int_equal -g_int_hash +#endif +#endif + +#if IN_HEADER(__G_IOCHANNEL_H__) +#if IN_FILE(__G_IOCHANNEL_C__) g_io_add_watch g_io_add_watch_full -g_io_channel_close +g_io_create_watch g_io_channel_error_from_errno g_io_channel_error_quark g_io_channel_flush @@ -297,18 +329,12 @@ g_io_channel_get_encoding g_io_channel_get_flags g_io_channel_get_line_term g_io_channel_init -g_io_channel_new_file PRIVATE -#ifdef G_OS_WIN32 -g_io_channel_new_file_utf8 -#endif -g_io_channel_read g_io_channel_read_chars g_io_channel_read_line g_io_channel_read_line_string g_io_channel_read_to_end g_io_channel_read_unichar g_io_channel_ref -g_io_channel_seek g_io_channel_seek_position g_io_channel_set_buffered g_io_channel_set_buffer_size @@ -317,10 +343,35 @@ g_io_channel_set_encoding g_io_channel_set_flags g_io_channel_set_line_term g_io_channel_shutdown +g_io_channel_unref +#ifndef G_DISABLE_DEPRECATED +g_io_channel_close +g_io_channel_read +g_io_channel_seek +g_io_channel_write +#endif +g_io_channel_write_chars +g_io_channel_write_unichar +#endif +#endif + +#if IN_HEADER(__G_IOCHANNEL_H__) +#if IN_FILE(__G_IO_UNIX_C__) +#ifdef G_OS_UNIX g_io_channel_unix_get_fd g_io_channel_unix_new -g_io_channel_unref +g_io_channel_new_file PRIVATE +#endif +#endif +#endif + +#if IN_HEADER(__G_IOCHANNEL_H__) +#if IN_FILE(__G_IO_WIN32_C__) #ifdef G_OS_WIN32 +g_io_channel_unix_get_fd +g_io_channel_unix_new +g_io_channel_new_file PRIVATE +g_io_channel_new_file_utf8 g_io_channel_win32_get_fd g_io_channel_win32_make_pollfd g_io_channel_win32_new_fd @@ -330,10 +381,11 @@ g_io_channel_win32_new_stream_socket g_io_channel_win32_poll g_io_channel_win32_set_debug #endif -g_io_channel_write -g_io_channel_write_chars -g_io_channel_write_unichar -g_io_create_watch +#endif +#endif + +#if IN_HEADER(__G_KEY_FILE_H__) +#if IN_FILE(__G_KEY_FILE_C__) g_key_file_error_quark g_key_file_free g_key_file_get_boolean @@ -370,8 +422,11 @@ g_key_file_set_string g_key_file_set_string_list g_key_file_set_value g_key_file_to_data G_GNUC_MALLOC -glib_check_version -g_listenv +#endif +#endif + +#if IN_HEADER(__G_LIST_H__) +#if IN_FILE(__G_LIST_C__) g_list_alloc g_list_append g_list_concat @@ -404,21 +459,20 @@ g_list_remove_link g_list_reverse g_list_sort g_list_sort_with_data -g_locale_from_utf8 G_GNUC_MALLOC -g_locale_to_utf8 G_GNUC_MALLOC -g_log G_GNUC_PRINTF(3,4) -g_log_default_handler -g_log_remove_handler -g_log_set_always_fatal -g_log_set_default_handler -g_log_set_fatal_mask -g_log_set_handler -g_logv -g_main_context_acquire -g_main_context_add_poll -g_main_context_check -g_main_context_default -g_main_context_dispatch +#endif +#endif + +#if IN_HEADER(__G_MAIN_H__) +#if IN_FILE(__G_MAIN_C__) +g_child_watch_add +g_child_watch_add_full +g_child_watch_source_new +g_get_current_time +g_main_context_acquire +g_main_context_add_poll +g_main_context_check +g_main_context_default +g_main_context_dispatch g_main_context_find_source_by_funcs_user_data g_main_context_find_source_by_id g_main_context_find_source_by_user_data @@ -443,8 +497,37 @@ g_main_loop_quit g_main_loop_ref g_main_loop_run g_main_loop_unref -g_malloc G_GNUC_MALLOC -g_malloc0 G_GNUC_MALLOC +g_source_add_poll +g_source_attach +g_source_destroy +g_source_get_can_recurse +g_source_get_context +g_source_get_current_time +g_source_get_id +g_source_get_priority +g_source_new +g_source_ref +g_source_remove +g_source_remove_by_funcs_user_data +g_source_remove_by_user_data +g_source_remove_poll +g_source_set_callback +g_source_set_callback_indirect +g_source_set_can_recurse +g_source_set_priority +g_source_unref +g_idle_add +g_idle_add_full +g_idle_remove_by_data +g_idle_source_new +g_timeout_add +g_timeout_add_full +g_timeout_source_new +#endif +#endif + +#if IN_HEADER(__G_MARKUP_H__) +#if IN_FILE(__G_MARKUP_C__) g_markup_error_quark g_markup_escape_text g_markup_parse_context_end_parse @@ -455,6 +538,12 @@ g_markup_parse_context_new g_markup_parse_context_parse g_markup_printf_escaped G_GNUC_PRINTF(1,2) g_markup_vprintf_escaped +#endif +#endif + +#if IN_HEADER(__G_MEM_H__) +#if IN_FILE(__G_MEM_C__) +g_free g_mem_chunk_alloc g_mem_chunk_alloc0 g_mem_chunk_clean @@ -464,14 +553,42 @@ g_mem_chunk_info g_mem_chunk_new g_mem_chunk_print g_mem_chunk_reset -g_memdup G_GNUC_MALLOC +g_malloc G_GNUC_MALLOC +g_malloc0 G_GNUC_MALLOC g_mem_is_system_malloc g_mem_profile g_mem_set_vtable -g_mkstemp PRIVATE -#ifdef G_OS_WIN32 -g_mkstemp_utf8 +g_realloc +g_allocator_free +g_allocator_new +g_blow_chunks +g_try_malloc G_GNUC_MALLOC +g_try_realloc +#endif +#endif + +#if IN_HEADER(__G_MESSAGES_H__) +#if IN_FILE(__G_MESSAGES_C__) +g_printf_string_upper_bound +g_log G_GNUC_PRINTF(3,4) +g_log_default_handler +g_log_remove_handler +g_log_set_always_fatal +g_log_set_default_handler +g_log_set_fatal_mask +g_log_set_handler +g_logv +g_return_if_fail_warning +g_assert_warning G_GNUC_NORETURN +g_print G_GNUC_PRINTF(1,2) +g_printerr G_GNUC_PRINTF(1,2) +g_set_printerr_handler +g_set_print_handler +#endif #endif + +#if IN_HEADER(__G_NODE_H__) +#if IN_FILE(__G_NODE_C__) g_node_child_index g_node_child_position g_node_children_foreach @@ -502,10 +619,11 @@ g_node_prepend g_node_reverse_children g_node_traverse g_node_unlink -g_nullify_pointer -g_once_impl -g_on_error_query -g_on_error_stack_trace +#endif +#endif + +#if IN_HEADER(__G_OPTION_H__) +#if IN_FILE(__G_OPTION_C__) g_option_context_add_group g_option_context_add_main_entries g_option_error_quark @@ -525,40 +643,48 @@ g_option_group_set_error_hook g_option_group_set_parse_hooks g_option_group_set_translate_func g_option_group_set_translation_domain -g_parse_debug_string -g_path_get_basename G_GNUC_MALLOC -g_path_get_dirname G_GNUC_MALLOC -g_path_is_absolute -g_path_skip_root +#endif +#endif + +#if IN_HEADER(__G_PATTERN_H__) +#if IN_FILE(__G_PATTERN_C__) g_pattern_match g_pattern_match_simple g_pattern_match_string g_pattern_spec_equal g_pattern_spec_free g_pattern_spec_new -g_print G_GNUC_PRINTF(1,2) -g_printerr G_GNUC_PRINTF(1,2) +#endif +#endif + +#if IN_HEADER(__G_PRIMES_H__) +#if IN_FILE(__G_PRIMES_C__) +g_spaced_primes_closest G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__G_PRINTF_H__) +#if IN_FILE(__G_PRINTF_C__) +g_fprintf G_GNUC_PRINTF(2,3) g_printf G_GNUC_PRINTF(1,2) -g_printf_string_upper_bound -g_propagate_error -g_ptr_array_add -g_ptr_array_foreach -g_ptr_array_free -g_ptr_array_new -g_ptr_array_remove -g_ptr_array_remove_fast -g_ptr_array_remove_index -g_ptr_array_remove_index_fast -g_ptr_array_remove_range -g_ptr_array_set_size -g_ptr_array_sized_new -g_ptr_array_sort -g_ptr_array_sort_with_data +g_sprintf G_GNUC_PRINTF(2,3) +g_snprintf G_GNUC_PRINTF(3,4) +g_vasprintf +g_vfprintf +g_vprintf +g_vsnprintf +g_vsprintf +#endif +#endif + +#if IN_HEADER(__G_QSORT_H__) +#if IN_FILE(__G_QSORT_C__) g_qsort_with_data -g_quark_from_static_string -g_quark_from_string -g_quark_to_string G_GNUC_CONST -g_quark_try_string +#endif +#endif + +#if IN_HEADER(__G_QUEUE_H__) +#if IN_FILE(__G_QUEUE_C__) g_queue_copy g_queue_delete_link g_queue_find @@ -596,6 +722,11 @@ g_queue_remove_all g_queue_reverse g_queue_sort g_queue_unlink +#endif +#endif + +#if IN_HEADER(__G_RAND_H__) +#if IN_FILE(__G_RAND_C__) g_rand_copy g_rand_double g_rand_double_range @@ -612,7 +743,11 @@ g_random_int_range g_random_set_seed g_rand_set_seed g_rand_set_seed_array -g_realloc +#endif +#endif + +#if IN_HEADER(__G_REL_H__) +#if IN_FILE(__G_REL_C__) g_relation_count g_relation_delete g_relation_destroy @@ -622,7 +757,13 @@ g_relation_insert g_relation_new g_relation_print g_relation_select -g_return_if_fail_warning +g_tuples_destroy +g_tuples_index +#endif +#endif + +#if IN_HEADER(__G_SCANNER_H__) +#if IN_FILE(__G_SCANNER_C__) g_scanner_cur_line g_scanner_cur_position g_scanner_cur_token @@ -644,19 +785,20 @@ g_scanner_set_scope g_scanner_sync_file_offset g_scanner_unexp_token g_scanner_warn G_GNUC_PRINTF(2,3) -g_set_application_name -g_setenv PRIVATE -#ifdef G_OS_WIN32 -g_setenv_utf8 #endif -g_set_error G_GNUC_PRINTF(4,5) -g_set_prgname -g_set_printerr_handler -g_set_print_handler +#endif + +#if IN_HEADER(__G_SHELL_H__) +#if IN_FILE(__G_SHELL_C__) g_shell_error_quark g_shell_parse_argv g_shell_quote g_shell_unquote +#endif +#endif + +#if IN_HEADER(__G_SLIST_H__) +#if IN_FILE(__G_SLIST_C__) g_slist_alloc g_slist_append g_slist_concat @@ -687,27 +829,11 @@ g_slist_remove_link g_slist_reverse g_slist_sort g_slist_sort_with_data -g_snprintf G_GNUC_PRINTF(3,4) -g_source_add_poll -g_source_attach -g_source_destroy -g_source_get_can_recurse -g_source_get_context -g_source_get_current_time -g_source_get_id -g_source_get_priority -g_source_new -g_source_ref -g_source_remove -g_source_remove_by_funcs_user_data -g_source_remove_by_user_data -g_source_remove_poll -g_source_set_callback -g_source_set_callback_indirect -g_source_set_can_recurse -g_source_set_priority -g_source_unref -g_spaced_primes_closest G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__G_SPAWN_H__) +#if IN_FILE(__G_SPAWN_C__) g_spawn_async g_spawn_async_with_pipes g_spawn_close_pid @@ -715,49 +841,85 @@ g_spawn_command_line_async g_spawn_command_line_sync g_spawn_error_quark g_spawn_sync -g_sprintf G_GNUC_PRINTF(2,3) -g_static_mutex_free -g_static_mutex_get_mutex_impl -g_static_mutex_init -g_static_private_free -g_static_private_get -g_static_private_init -g_static_private_set -g_static_rec_mutex_free -g_static_rec_mutex_init -g_static_rec_mutex_lock -g_static_rec_mutex_lock_full -g_static_rec_mutex_trylock -g_static_rec_mutex_unlock -g_static_rec_mutex_unlock_full -g_static_rw_lock_free -g_static_rw_lock_init -g_static_rw_lock_reader_lock -g_static_rw_lock_reader_trylock -g_static_rw_lock_reader_unlock -g_static_rw_lock_writer_lock -g_static_rw_lock_writer_trylock -g_static_rw_lock_writer_unlock +#endif +#endif + +#if IN_HEADER(__G_STDIO_H__) +#if IN_FILE(__G_STDIO_C__) +#if !defined(G_OS_UNIX) || defined(G_STDIO_NO_WRAP_ON_UNIX) +/* gstdio wrappers */ +g_open +g_rename +g_mkdir +g_stat +g_lstat +g_unlink +g_remove +g_rmdir +g_fopen +g_freopen +#endif +#endif +#endif + +#if IN_HEADER(__G_STRFUNCS_H__) +#if IN_FILE(__G_STRFUNCS_C__) +g_ascii_digit_value G_GNUC_CONST +g_ascii_dtostr +g_ascii_formatd +g_ascii_strdown G_GNUC_MALLOC +g_ascii_strtod +g_ascii_strtoull +g_ascii_strup G_GNUC_MALLOC +g_ascii_tolower G_GNUC_CONST +g_ascii_toupper G_GNUC_CONST +g_ascii_xdigit_value G_GNUC_CONST +g_ascii_strcasecmp +g_ascii_strncasecmp +g_memdup G_GNUC_MALLOC g_stpcpy g_strcanon -g_strcasecmp g_strchomp g_strchug g_strcompress G_GNUC_MALLOC g_strconcat G_GNUC_MALLOC G_GNUC_NULL_TERMINATED g_strdelimit -g_strdown g_strdup G_GNUC_MALLOC g_strdup_printf G_GNUC_PRINTF(1,2) G_GNUC_MALLOC g_strdupv G_GNUC_MALLOC g_strdup_vprintf G_GNUC_MALLOC -g_str_equal g_strerror G_GNUC_CONST g_strescape G_GNUC_MALLOC g_strfreev -g_str_hash g_str_has_prefix g_str_has_suffix +g_strjoin G_GNUC_MALLOC G_GNUC_NULL_TERMINATED +g_strjoinv G_GNUC_MALLOC +g_strlcat +g_strlcpy +g_strndup G_GNUC_MALLOC +g_strnfill G_GNUC_MALLOC +g_strreverse +g_strrstr +g_strrstr_len +g_strsignal G_GNUC_CONST +g_strsplit G_GNUC_MALLOC +g_strsplit_set G_GNUC_MALLOC +g_strstr_len +g_strtod +#ifndef G_DISABLE_DEPRECATED +g_strcasecmp +g_strncasecmp +g_strup +g_strdown +#endif +g_strv_length +g_strip_context +#endif +#endif + +#if IN_HEADER(__G_STRING_H__) +#if IN_FILE(__G_STRING_C__) g_string_append g_string_append_len g_string_append_printf G_GNUC_PRINTF(2,3) @@ -770,7 +932,6 @@ g_string_chunk_insert g_string_chunk_insert_const g_string_chunk_insert_len g_string_chunk_new -g_string_down g_string_equal g_string_erase g_string_free @@ -789,29 +950,62 @@ g_string_printf G_GNUC_PRINTF(2,3) g_string_set_size g_string_sized_new g_string_truncate +#ifndef G_DISABLE_DEPRECATED +g_string_down g_string_up -g_strip_context -g_strjoin G_GNUC_MALLOC G_GNUC_NULL_TERMINATED -g_strjoinv G_GNUC_MALLOC -g_strlcat -g_strlcpy -g_strncasecmp -g_strndup G_GNUC_MALLOC -g_strnfill G_GNUC_MALLOC -g_strreverse -g_strrstr -g_strrstr_len -g_strsignal G_GNUC_CONST -g_strsplit G_GNUC_MALLOC -g_strsplit_set G_GNUC_MALLOC -g_strstr_len -g_strtod -g_strup -g_strv_length +#endif +#ifdef INCLUDE_INTERNAL_SYMBOLS +g_string_append_c +#endif +g_str_equal +g_str_hash +#endif +#endif + +#if IN_HEADER(__G_THREAD_H__) +#if IN_FILE(__G_THREAD_C__) +g_once_impl +#ifdef INCLUDE_INTERNAL_SYMBOLS +g_thread_init_glib +#endif +#ifdef INCLUDE_VARIABLES +g_thread_functions_for_glib_use +g_threads_got_initialized +g_thread_use_default_impl +#endif g_thread_create_full g_thread_error_quark g_thread_exit g_thread_join +g_thread_self +g_thread_set_priority +g_static_mutex_free +g_static_mutex_get_mutex_impl +g_static_mutex_init +g_static_private_free +g_static_private_get +g_static_private_init +g_static_private_set +g_static_rec_mutex_free +g_static_rec_mutex_init +g_static_rec_mutex_lock +g_static_rec_mutex_lock_full +g_static_rec_mutex_trylock +g_static_rec_mutex_unlock +g_static_rec_mutex_unlock_full +g_static_rw_lock_free +g_static_rw_lock_init +g_static_rw_lock_reader_lock +g_static_rw_lock_reader_trylock +g_static_rw_lock_reader_unlock +g_static_rw_lock_writer_lock +g_static_rw_lock_writer_trylock +g_static_rw_lock_writer_unlock +#endif +#endif + +#if IN_HEADER(__G_THREADPOOL_H__) +#if IN_FILE(__G_THREADPOOL_C__) g_thread_pool_free g_thread_pool_get_max_threads g_thread_pool_get_max_unused_threads @@ -823,11 +1017,11 @@ g_thread_pool_set_max_threads g_thread_pool_set_max_unused_threads g_thread_pool_stop_unused_threads g_thread_pool_unprocessed -g_thread_self -g_thread_set_priority -g_timeout_add -g_timeout_add_full -g_timeout_source_new +#endif +#endif + +#if IN_HEADER(__G_TIMER_H__) +#if IN_FILE(__G_TIMER_C__) g_timer_continue g_timer_destroy g_timer_elapsed @@ -836,6 +1030,12 @@ g_timer_reset g_timer_start g_timer_stop g_time_val_add +g_usleep +#endif +#endif + +#if IN_HEADER(__G_TREE_H__) +#if IN_FILE(__G_TREE_C__) g_tree_destroy g_tree_foreach g_tree_height @@ -850,16 +1050,35 @@ g_tree_remove g_tree_replace g_tree_search g_tree_steal +#ifndef G_DISABLE_DEPRECATED g_tree_traverse -g_try_malloc G_GNUC_MALLOC -g_try_realloc -g_tuples_destroy -g_tuples_index -g_ucs4_to_utf16 G_GNUC_MALLOC -g_ucs4_to_utf8 G_GNUC_MALLOC +#endif +#endif +#endif + +#if IN_HEADER(__G_UNICODE_H__) +#if IN_FILE(__G_UNIBREAK_C__) g_unichar_break_type G_GNUC_CONST -g_unichar_digit_value G_GNUC_CONST -g_unichar_get_mirror_char +#endif +#endif + +#if IN_HEADER(__G_UNICODE_H__) +#if IN_FILE(__G_UNICOLLATE_C__) +g_utf8_collate +g_utf8_collate_key G_GNUC_MALLOC +#endif +#endif + +#if IN_HEADER(__G_UNICODE_H__) +#if IN_FILE(__G_UNIDECOMP_C__) +g_unicode_canonical_decomposition G_GNUC_MALLOC +g_unicode_canonical_ordering +g_utf8_normalize +#endif +#endif + +#if IN_HEADER(__G_UNICODE_H__) +#if IN_FILE(__G_UNIPROP_C__) g_unichar_isalnum G_GNUC_CONST g_unichar_isalpha G_GNUC_CONST g_unichar_iscntrl G_GNUC_CONST @@ -877,47 +1096,118 @@ g_unichar_isxdigit G_GNUC_CONST g_unichar_tolower G_GNUC_CONST g_unichar_totitle G_GNUC_CONST g_unichar_toupper G_GNUC_CONST -g_unichar_to_utf8 -g_unichar_type G_GNUC_CONST -g_unichar_validate +g_unichar_get_mirror_char +g_unichar_digit_value G_GNUC_CONST g_unichar_xdigit_value G_GNUC_CONST -g_unicode_canonical_decomposition G_GNUC_MALLOC -g_unicode_canonical_ordering -g_unsetenv PRIVATE -#ifdef G_OS_WIN32 -g_unsetenv_utf8 +g_unichar_type G_GNUC_CONST +g_utf8_casefold G_GNUC_MALLOC +g_utf8_strup G_GNUC_MALLOC +g_utf8_strdown G_GNUC_MALLOC #endif -g_uri_list_extract_uris G_GNUC_MALLOC -g_usleep +#endif + +#if IN_HEADER(__G_UNICODE_H__) +#if IN_FILE(__G_UTF8_C__) +g_get_charset +g_ucs4_to_utf16 G_GNUC_MALLOC +g_ucs4_to_utf8 G_GNUC_MALLOC g_utf16_to_ucs4 G_GNUC_MALLOC g_utf16_to_utf8 G_GNUC_MALLOC -g_utf8_casefold G_GNUC_MALLOC -g_utf8_collate -g_utf8_collate_key G_GNUC_MALLOC g_utf8_find_next_char g_utf8_find_prev_char g_utf8_get_char g_utf8_get_char_validated -g_utf8_normalize G_GNUC_MALLOC g_utf8_offset_to_pointer g_utf8_pointer_to_offset g_utf8_prev_char g_utf8_strchr -g_utf8_strdown G_GNUC_MALLOC g_utf8_strlen g_utf8_strncpy g_utf8_strrchr g_utf8_strreverse -g_utf8_strup G_GNUC_MALLOC g_utf8_to_ucs4 G_GNUC_MALLOC g_utf8_to_ucs4_fast G_GNUC_MALLOC g_utf8_to_utf16 G_GNUC_MALLOC g_utf8_validate -g_vasprintf -g_vfprintf -g_vprintf -g_vsnprintf -g_vsprintf +g_unichar_to_utf8 +g_unichar_validate +#endif +#endif + +#if IN_HEADER(__G_HASH_H__) +#if IN_FILE(__G_UTILS_C__) +g_int_equal +g_int_hash +g_direct_equal G_GNUC_CONST +g_direct_hash G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__G_UTILS_H__) +#if IN_FILE(__G_UTILS_C__) +g_atexit +#ifndef G_DISABLE_DEPRECATED +g_basename +#endif +g_get_application_name +g_find_program_in_path PRIVATE +g_get_current_dir PRIVATE +g_getenv PRIVATE +g_unsetenv PRIVATE +g_get_home_dir PRIVATE +g_setenv PRIVATE +g_listenv PRIVATE +#ifdef G_OS_WIN32 +g_find_program_in_path_utf8 +g_get_current_dir_utf8 +g_getenv_utf8 +g_unsetenv_utf8 +g_setenv_utf8 +g_get_home_dir_utf8 +#endif +g_get_language_names +g_get_prgname +g_get_real_name PRIVATE +#ifdef G_OS_WIN32 +g_get_real_name_utf8 +#endif +g_get_system_config_dirs +g_get_system_data_dirs +g_get_tmp_dir PRIVATE +#ifdef G_OS_WIN32 +g_get_tmp_dir_utf8 +#endif +g_get_user_cache_dir +g_get_user_config_dir +g_get_user_data_dir +g_get_user_name PRIVATE +#ifdef G_OS_WIN32 +g_get_user_name_utf8 +#endif +glib_check_version +g_nullify_pointer +g_parse_debug_string +g_path_get_basename G_GNUC_MALLOC +g_path_get_dirname G_GNUC_MALLOC +g_path_is_absolute +g_path_skip_root +g_set_application_name +g_set_prgname +#ifdef INCLUDE_INTERNAL_SYMBOLS +g_bit_nth_lsf +g_bit_nth_msf +g_bit_storage +g_trash_stack_height +g_trash_stack_peek +g_trash_stack_pop +g_trash_stack_push +g_get_codeset +#endif +#endif +#endif + +#if IN_HEADER(__G_WIN32_H__) +#if IN_FILE(__G_WIN32_H__) #ifdef G_OS_WIN32 g_win32_error_message g_win32_ftruncate @@ -928,6 +1218,9 @@ g_win32_get_package_installation_subdirectory_utf8 g_win32_get_windows_version g_win32_getlocale #endif +#endif +#endif + #ifdef INCLUDE_VARIABLES g_ascii_table g_utf8_skip @@ -935,9 +1228,6 @@ g_idle_funcs g_timeout_funcs g_io_watch_funcs g_child_watch_funcs -g_thread_functions_for_glib_use -g_thread_use_default_impl -g_threads_got_initialized glib_binary_age glib_interface_age glib_major_version @@ -945,29 +1235,4 @@ glib_mem_profiler_table glib_micro_version glib_minor_version #endif -#ifdef INCLUDE_INTERNAL_SYMBOLS -/* internal or inline symbols */ -g_get_codeset -g_string_append_c -g_thread_init_glib -g_trash_stack_height -g_trash_stack_peek -g_trash_stack_pop -g_trash_stack_push -g_bit_nth_lsf -g_bit_nth_msf -g_bit_storage -#endif -#if !defined(G_OS_UNIX) || defined(G_STDIO_NO_WRAP_ON_UNIX) -/* gstdio wrappers */ -g_open -g_rename -g_mkdir -g_stat -g_lstat -g_unlink -g_remove -g_rmdir -g_fopen -g_freopen -#endif + diff --git a/glib/glist.c b/glib/glist.c index 2a4f74d7..ab94a3d7 100644 --- a/glib/glist.c +++ b/glib/glist.c @@ -30,8 +30,8 @@ #include "config.h" -#include "galias.h" #include "glib.h" +#include "galias.h" #ifndef DISABLE_MEM_POOLS @@ -814,3 +814,5 @@ g_list_sort_with_data (GList *list, return g_list_sort_real (list, (GFunc) compare_func, TRUE, user_data); } +#define __G_LIST_C__ +#include "galiasdef.c" diff --git a/glib/gmain.c b/glib/gmain.c index a9382aeb..20ee9ffa 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -36,7 +36,6 @@ /* uncomment the next line to get poll() debugging info */ /* #define G_MAIN_POLL_DEBUG */ -#include "galias.h" #include "glib.h" #include "gthreadinit.h" #include @@ -76,6 +75,9 @@ #include #include #endif + +#include "galias.h" + /* Types */ typedef struct _GTimeoutSource GTimeoutSource; @@ -3916,3 +3918,5 @@ g_idle_remove_by_data (gpointer data) return g_source_remove_by_funcs_user_data (&g_idle_funcs, data); } +#define __G_MAIN_C__ +#include "galiasdef.c" diff --git a/glib/gmarkup.c b/glib/gmarkup.c index 4d7bc9ad..ab6179f9 100644 --- a/glib/gmarkup.c +++ b/glib/gmarkup.c @@ -26,8 +26,8 @@ #include #include -#include "galias.h" #include "glib.h" +#include "galias.h" #include "glibintl.h" @@ -2259,3 +2259,6 @@ g_markup_printf_escaped (const char *format, ...) return result; } + +#define __G_MARKUP_C__ +#include "galiasdef.c" diff --git a/glib/gmem.c b/glib/gmem.c index 0a07be46..86e6d444 100644 --- a/glib/gmem.c +++ b/glib/gmem.c @@ -34,9 +34,9 @@ #include #include -#include "galias.h" #include "glib.h" #include "gthreadinit.h" +#include "galias.h" /* notes on macros: * having DISABLE_MEM_POOLS defined, disables mem_chunks alltogether, their @@ -1272,3 +1272,5 @@ _g_mem_thread_private_init (void) #endif } +#define __G_MEM_C__ +#include "galiasdef.c" diff --git a/glib/gmessages.c b/glib/gmessages.c index ef6e7a58..c3adab75 100644 --- a/glib/gmessages.c +++ b/glib/gmessages.c @@ -41,11 +41,11 @@ #include #include -#include "galias.h" #include "glib.h" #include "gdebug.h" #include "gprintfint.h" #include "gthreadinit.h" +#include "galias.h" #ifdef G_OS_WIN32 #include @@ -1122,3 +1122,6 @@ _g_debug_init (void) g_log_set_always_fatal (fatal_mask); } } + +#define __G_MESSAGES_C__ +#include "galiasdef.c" diff --git a/glib/gnode.c b/glib/gnode.c index 90dde6fe..572da5cc 100644 --- a/glib/gnode.c +++ b/glib/gnode.c @@ -33,8 +33,8 @@ #include "config.h" -#include "galias.h" #include "glib.h" +#include "galias.h" #ifndef DISABLE_MEM_POOLS /* node allocation @@ -1048,3 +1048,6 @@ g_node_children_foreach (GNode *node, } } } + +#define __G_NODE_C__ +#include "galiasdef.c" diff --git a/glib/goption.c b/glib/goption.c index a41412bd..13104f91 100644 --- a/glib/goption.c +++ b/glib/goption.c @@ -21,12 +21,12 @@ #include "config.h" -#include "galias.h" - #include "goption.h" #include "glib.h" #include "gi18n.h" +#include "galias.h" + #include #include #include @@ -1657,3 +1657,5 @@ g_option_group_set_translation_domain (GOptionGroup *group, g_free); } +#define __G_OPTION_C__ +#include "galiasdef.c" diff --git a/glib/gpattern.c b/glib/gpattern.c index b619501d..8381bcca 100644 --- a/glib/gpattern.c +++ b/glib/gpattern.c @@ -21,7 +21,6 @@ #include -#include "galias.h" #include "gpattern.h" #include "gmacros.h" @@ -29,6 +28,7 @@ #include "gmem.h" #include "gunicode.h" #include "gutils.h" +#include "galias.h" /* keep enum and structure of gpattern.c and patterntest.c in sync */ typedef enum @@ -320,3 +320,6 @@ g_pattern_match_simple (const gchar *pattern, return ergo; } + +#define __G_PATTERN_C__ +#include "galiasdef.c" diff --git a/glib/gprimes.c b/glib/gprimes.c index 013ace3a..7beca710 100644 --- a/glib/gprimes.c +++ b/glib/gprimes.c @@ -30,8 +30,8 @@ #include "config.h" -#include "galias.h" #include "glib.h" +#include "galias.h" static const guint g_primes[] = @@ -85,3 +85,6 @@ g_spaced_primes_closest (guint num) return g_primes[g_nprimes - 1]; } + +#define __G_PRIMES_C__ +#include "galiasdef.c" diff --git a/glib/gprintf.c b/glib/gprintf.c index a6a1e22c..2c3f29c1 100644 --- a/glib/gprintf.c +++ b/glib/gprintf.c @@ -27,11 +27,12 @@ #include #include -#include "galias.h" #include "glib.h" #include "gprintf.h" #include "gprintfint.h" +#include "galias.h" + /** * g_printf: * @format: a standard printf() format string, but notice @@ -337,6 +338,5 @@ g_vasprintf (gchar **string, return len; } - - - +#define __G_PRINTF_C__ +#include "galiasdef.c" diff --git a/glib/gqsort.c b/glib/gqsort.c index 0e8c0741..176d44a9 100644 --- a/glib/gqsort.c +++ b/glib/gqsort.c @@ -38,8 +38,8 @@ #include #include -#include "galias.h" #include "glib.h" +#include "galias.h" /* Byte-wise swap two items of size SIZE. */ #define SWAP(a, b, size) \ @@ -282,3 +282,6 @@ g_qsort_with_data (gconstpointer pbase, } } } + +#define __G_QSORT_C__ +#include "galiasdef.c" diff --git a/glib/gqueue.c b/glib/gqueue.c index bcdf0f9e..5159f255 100644 --- a/glib/gqueue.c +++ b/glib/gqueue.c @@ -26,8 +26,8 @@ #include "config.h" -#include "galias.h" #include "glib.h" +#include "galias.h" G_LOCK_DEFINE_STATIC (queue_memchunk); @@ -1001,3 +1001,6 @@ g_queue_insert_sorted (GQueue *queue, else g_queue_push_tail (queue, data); } + +#define __G_QUEUE_C__ +#include "galiasdef.c" diff --git a/glib/grand.c b/glib/grand.c index 7650836e..c4ea8eea 100644 --- a/glib/grand.c +++ b/glib/grand.c @@ -47,9 +47,9 @@ #include #endif -#include "galias.h" #include "glib.h" #include "gthreadinit.h" +#include "galias.h" #ifdef G_OS_WIN32 #include /* For getpid() */ @@ -635,3 +635,6 @@ g_random_set_seed (guint32 seed) G_UNLOCK (global_random); } + +#define __G_RAND_C__ +#include "galiasdef.c" diff --git a/glib/grel.c b/glib/grel.c index 54fab40e..eeb9be45 100644 --- a/glib/grel.c +++ b/glib/grel.c @@ -32,8 +32,8 @@ #include #include -#include "galias.h" #include "glib.h" +#include "galias.h" typedef struct _GRealTuples GRealTuples; @@ -452,3 +452,6 @@ g_relation_print (GRelation *relation) } } + +#define __G_REL_C__ +#include "galiasdef.c" diff --git a/glib/gscanner.c b/glib/gscanner.c index c54b3ac6..4204526e 100644 --- a/glib/gscanner.c +++ b/glib/gscanner.c @@ -42,9 +42,9 @@ #include #endif -#include "galias.h" #include "glib.h" #include "gprintfint.h" +#include "galias.h" #ifdef G_OS_WIN32 #include /* For _read() */ @@ -1763,3 +1763,6 @@ g_scanner_get_token_ll (GScanner *scanner, *token_p = token; *value_p = value; } + +#define __G_SCANNER_C__ +#include "galiasdef.c" diff --git a/glib/gshell.c b/glib/gshell.c index 679ebf2c..5dfc4b65 100644 --- a/glib/gshell.c +++ b/glib/gshell.c @@ -24,8 +24,8 @@ #include -#include "galias.h" #include "glib.h" +#include "galias.h" #ifdef _ #warning "FIXME remove gettext hack" @@ -671,3 +671,6 @@ g_shell_parse_argv (const gchar *command_line, return FALSE; } + +#define __G_SHELL_C__ +#include "galiasdef.c" diff --git a/glib/gslist.c b/glib/gslist.c index 2fca5e07..bdba1f33 100644 --- a/glib/gslist.c +++ b/glib/gslist.c @@ -30,8 +30,8 @@ #include "config.h" -#include "galias.h" #include "glib.h" +#include "galias.h" #ifndef DISABLE_MEM_POOLS @@ -764,3 +764,6 @@ g_slist_sort_with_data (GSList *list, { return g_slist_sort_real (list, (GFunc) compare_func, TRUE, user_data); } + +#define __G_SLIST_C__ +#include "galiasdef.c" diff --git a/glib/gspawn-win32.c b/glib/gspawn-win32.c index 083c32f3..438191c3 100644 --- a/glib/gspawn-win32.c +++ b/glib/gspawn-win32.c @@ -44,9 +44,9 @@ #include -#include "galias.h" #include "glib.h" #include "gprintfint.h" +#include "galias.h" #include #include @@ -1018,3 +1018,6 @@ g_spawn_close_pid (GPid pid) { CloseHandle (pid); } + +#define __G_SPAWN_C__ +#include "galiasdef.c" diff --git a/glib/gspawn.c b/glib/gspawn.c index 623b10b8..32f2f3a0 100644 --- a/glib/gspawn.c +++ b/glib/gspawn.c @@ -35,8 +35,8 @@ #include #endif /* HAVE_SYS_SELECT_H */ -#include "galias.h" #include "glib.h" +#include "galias.h" #include "glibintl.h" @@ -1547,3 +1547,6 @@ void g_spawn_close_pid (GPid pid) { } + +#define __G_SPAWN_C__ +#include "galiasdef.c" diff --git a/glib/gstdio.c b/glib/gstdio.c index 38c37618..8389dcd5 100644 --- a/glib/gstdio.c +++ b/glib/gstdio.c @@ -21,7 +21,6 @@ #include "config.h" #define G_STDIO_NO_WRAP_ON_UNIX -#include "galias.h" #include "glib.h" @@ -42,6 +41,8 @@ #include "gstdio.h" +#include "galias.h" + #if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) #error Please port this to your operating system #endif @@ -730,3 +731,6 @@ g_freopen (const gchar *filename, return freopen (filename, mode, stream); #endif } + +#define __G_STDIO_C__ +#include "galiasdef.c" diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c index 89a50083..80789881 100644 --- a/glib/gstrfuncs.c +++ b/glib/gstrfuncs.c @@ -43,11 +43,12 @@ #include #endif -#include "galias.h" #include "glib.h" #include "gprintf.h" #include "gprintfint.h" +#include "galias.h" + #ifdef G_OS_WIN32 #include #endif @@ -2727,3 +2728,6 @@ g_strv_length (gchar **str_array) return i; } + +#define __G_STRFUNCS_C__ +#include "galiasdef.c" diff --git a/glib/gstring.c b/glib/gstring.c index 9b6aaffa..892930ad 100644 --- a/glib/gstring.c +++ b/glib/gstring.c @@ -39,10 +39,10 @@ #include #include -#include "galias.h" #include "glib.h" #include "gprintf.h" +#include "galias.h" struct _GStringChunk { @@ -858,3 +858,6 @@ g_string_append_printf (GString *string, g_string_append_printf_internal (string, fmt, args); va_end (args); } + +#define __G_STRING_C__ +#include "galiasdef.c" diff --git a/glib/gthread.c b/glib/gthread.c index fe69dfb4..e1a10804 100644 --- a/glib/gthread.c +++ b/glib/gthread.c @@ -40,9 +40,9 @@ #include -#include "galias.h" #include "glib.h" #include "gthreadinit.h" +#include "galias.h" #if GLIB_SIZEOF_SYSTEM_THREAD == SIZEOF_VOID_P # define g_system_thread_equal_simple(thread1, thread2) \ @@ -837,3 +837,6 @@ g_static_rw_lock_free (GStaticRWLock* lock) } g_static_mutex_free (&lock->mutex); } + +#define __G_THREAD_C__ +#include "galiasdef.c" diff --git a/glib/gthreadpool.c b/glib/gthreadpool.c index 101e5e30..16156518 100644 --- a/glib/gthreadpool.c +++ b/glib/gthreadpool.c @@ -26,8 +26,8 @@ #include "config.h" -#include "galias.h" #include "glib.h" +#include "galias.h" typedef struct _GRealThreadPool GRealThreadPool; @@ -681,3 +681,6 @@ void g_thread_pool_stop_unused_threads (void) g_thread_pool_set_max_unused_threads (0); g_thread_pool_set_max_unused_threads (oldval); } + +#define __G_THREADPOOL_C__ +#include "galiasdef.c" diff --git a/glib/gtimer.c b/glib/gtimer.c index a30dc194..9b0e9115 100644 --- a/glib/gtimer.c +++ b/glib/gtimer.c @@ -29,7 +29,6 @@ */ #include "config.h" -#include "galias.h" #include "glibconfig.h" #ifdef HAVE_UNISTD_H @@ -47,6 +46,7 @@ #endif /* G_OS_WIN32 */ #include "glib.h" +#include "galias.h" struct _GTimer @@ -314,3 +314,6 @@ g_time_val_add (GTimeVal *time_, glong microseconds) } } } + +#define __G_TIMER_C__ +#include "galiasdef.c" diff --git a/glib/gtree.c b/glib/gtree.c index bbdc7d55..3eb8667b 100644 --- a/glib/gtree.c +++ b/glib/gtree.c @@ -30,8 +30,8 @@ #include "config.h" -#include "galias.h" #include "glib.h" +#include "galias.h" typedef struct _GTreeNode GTreeNode; @@ -1067,3 +1067,6 @@ g_tree_node_check (GTreeNode *node) g_tree_node_check (node->right); } } + +#define __G_TREE_C__ +#include "galiasdef.c" diff --git a/glib/gunibreak.c b/glib/gunibreak.c index 1d4c20e9..9c129218 100644 --- a/glib/gunibreak.c +++ b/glib/gunibreak.c @@ -22,9 +22,9 @@ #include -#include "galias.h" #include "glib.h" #include "gunibreak.h" +#include "galias.h" #define TPROP_PART1(Page, Char) \ ((break_property_table_part1[Page] >= G_UNICODE_MAX_TABLE_INDEX) \ @@ -61,3 +61,6 @@ g_unichar_break_type (gunichar c) { return PROP (c); } + +#define __G_UNIBREAK_C__ +#include "galiasdef.c" diff --git a/glib/gunicollate.c b/glib/gunicollate.c index 1ca82772..f3e28575 100644 --- a/glib/gunicollate.c +++ b/glib/gunicollate.c @@ -26,9 +26,9 @@ #include #endif -#include "galias.h" #include "glib.h" #include "gunicodeprivate.h" +#include "galias.h" /** * g_utf8_collate: @@ -261,3 +261,6 @@ g_utf8_collate_key (const gchar *str, return result; } + +#define __G_UNICOLLATE_C__ +#include "galiasdef.c" diff --git a/glib/gunidecomp.c b/glib/gunidecomp.c index d4cf0ec3..a7ccfc93 100644 --- a/glib/gunidecomp.c +++ b/glib/gunidecomp.c @@ -23,11 +23,11 @@ #include -#include "galias.h" #include "glib.h" #include "gunidecomp.h" #include "gunicomp.h" #include "gunicodeprivate.h" +#include "galias.h" #define CC_PART1(Page, Char) \ @@ -520,3 +520,6 @@ g_utf8_normalize (const gchar *str, return result; } + +#define __G_UNIDECOMP_C__ +#include "galiasdef.c" diff --git a/glib/guniprop.c b/glib/guniprop.c index 8859ba62..6c88a27c 100644 --- a/glib/guniprop.c +++ b/glib/guniprop.c @@ -25,10 +25,10 @@ #include #include -#include "galias.h" #include "glib.h" #include "gunichartables.h" #include "gunicodeprivate.h" +#include "galias.h" #define ATTR_TABLE(Page) (((Page) <= G_UNICODE_LAST_PAGE_PART1) \ ? attr_table_part1[Page] \ @@ -1055,3 +1055,6 @@ g_unichar_get_mirror_char (gunichar ch, return found; } + +#define __G_UNIPROP_C__ +#include "galiasdef.c" diff --git a/glib/gutf8.c b/glib/gutf8.c index a05a66aa..d3aa85d7 100644 --- a/glib/gutf8.c +++ b/glib/gutf8.c @@ -27,8 +27,8 @@ #endif #include -#include "galias.h" #include "glib.h" +#include "galias.h" #ifdef G_PLATFORM_WIN32 #include @@ -1767,3 +1767,6 @@ g_utf8_strreverse (const gchar *str, return result; } + +#define __G_UTF8_C__ +#include "galiasdef.c" diff --git a/glib/gutils.c b/glib/gutils.c index 5e85b737..95cf2020 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -51,10 +51,10 @@ */ #define G_IMPLEMENT_INLINES 1 #define __G_UTILS_C__ -#include "galias.h" #include "glib.h" #include "gprintfint.h" #include "gthreadinit.h" +#include "galias.h" #ifdef MAXPATHLEN #define G_PATH_LENGTH MAXPATHLEN @@ -2740,3 +2740,6 @@ g_get_tmp_dir (void) } #endif + +#define __G_UTILS_C__ +#include "galiasdef.c" diff --git a/glib/gwin32.c b/glib/gwin32.c index adc93a50..79b90fc2 100644 --- a/glib/gwin32.c +++ b/glib/gwin32.c @@ -31,7 +31,6 @@ #include "config.h" -#include "galias.h" #include "glibconfig.h" #include @@ -53,6 +52,7 @@ #endif /* _MSC_VER */ #include "glib.h" +#include "galias.h" #ifdef G_WITH_CYGWIN #include @@ -1466,3 +1466,6 @@ g_win32_get_windows_version (void) return windows_version; } + +#define __G_WIN32_C__ +#include "galiasdef.c" diff --git a/glib/makegalias.pl b/glib/makegalias.pl index 1978784b..1fa132f0 100755 --- a/glib/makegalias.pl +++ b/glib/makegalias.pl @@ -1,32 +1,37 @@ #!/usr/bin/perl -w +my $do_def = 0; + +if (($#ARGV >= 0) && ($ARGV[0] eq "-def")) { + shift; + $do_def = 1; +} + print <) { next; } - if ($_ =~ /^\#ifdef\s+(INCLUDE_VARIABLES|INCLUDE_INTERNAL_SYMBOLS)/) + if ($_ =~ /^\#ifdef\s+(INCLUDE_VARIABLES|INCLUDE_INTERNAL_SYMBOLS|ALL_FILES)/) { $in_skipped_section = 1; } @@ -82,7 +87,7 @@ while (<>) { next; } - if ($_ =~ /^\#if.*G_STDIO_NO_WRAP_ON_UNIX/) + if ($_ =~ /^\#if.*(G_STDIO_NO_WRAP_ON_UNIX|IN_FILE|IN_HEADER|IN_FILE)/) { print $_; @@ -103,25 +108,26 @@ while (<>) { foreach $word (@words) { $attributes = "$attributes $word" unless $word eq "PRIVATE"; } - - print <