[glib/protected-visibility] glib/: Replace galias with protected visibility
- From: Ryan Lortie <ryanl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/protected-visibility] glib/: Replace galias with protected visibility
- Date: Mon, 15 Mar 2010 02:29:52 +0000 (UTC)
commit 6da4c1b184fb757dcac267364c5735aafc0feadb
Author: Ryan Lortie <desrt desrt ca>
Date: Sun Mar 14 22:24:36 2010 -0400
glib/: Replace galias with protected visibility
glib/Makefile.am | 9 ---
glib/garray.c | 7 +--
glib/gasyncqueue.c | 7 +--
glib/gatomic-gcc.c | 6 +--
glib/gatomic.c | 6 +--
glib/gbacktrace.c | 7 +--
glib/gbase64.c | 8 +--
glib/gbitlock.c | 8 +--
glib/gbookmarkfile.c | 26 ++++-----
glib/gbuffer.c | 4 +-
glib/gcache.c | 6 +--
glib/gchecksum.c | 7 +--
glib/gcompletion.c | 6 +--
glib/gconvert.c | 9 +--
glib/gdataset.c | 11 +--
glib/gdate.c | 8 +--
glib/gdir.c | 7 +--
glib/gerror.c | 7 +--
glib/gfileutils.c | 7 +--
glib/ghash.c | 8 +--
glib/ghook.c | 7 +--
glib/ghostutils.c | 7 +--
glib/giochannel.c | 7 +--
glib/giounix.c | 6 +--
glib/giowin32.c | 7 +--
glib/gkeyfile.c | 11 +---
glib/glist.c | 6 +--
glib/gmacros.h | 2 +-
glib/gmain.c | 11 +---
glib/gmappedfile.c | 7 +--
glib/gmarkup.c | 6 +--
glib/gmem.c | 8 +--
glib/gmessages.c | 6 +--
glib/gnode.c | 6 +--
glib/goption.c | 17 ++----
glib/gpattern.c | 6 +--
glib/gpoll.c | 7 +--
glib/gprimes.c | 7 +--
glib/gprintf.c | 7 +--
glib/gqsort.c | 6 +--
glib/gqueue.c | 6 +--
glib/grand.c | 7 +--
glib/gregex.c | 9 +--
glib/grel.c | 6 +--
glib/gscanner.c | 12 ++--
glib/gsequence.c | 7 +--
glib/gshell.c | 12 +---
glib/gslice.c | 6 +--
glib/gslist.c | 6 +--
glib/gspawn-win32-helper.c | 2 +-
glib/gspawn-win32.c | 6 +--
glib/gspawn.c | 6 +--
glib/gstdio.c | 7 +--
glib/gstrfuncs.c | 12 +---
glib/gstring.c | 11 +--
glib/gtestutils.c | 8 +--
glib/gthread.c | 8 +--
glib/gthreadpool.c | 8 +--
glib/gtimer.c | 6 +--
glib/gtree.c | 8 +--
glib/gunibreak.c | 6 +--
glib/gunicollate.c | 7 +--
glib/gunidecomp.c | 7 +--
glib/guniprop.c | 7 +--
glib/gurifuncs.c | 8 +--
glib/gutf8.c | 9 +--
glib/gutils.c | 9 +--
glib/gvariant-core.c | 7 +--
glib/gvariant-internal.h | 4 +
glib/gvariant-serialiser.c | 7 +--
glib/gvariant-serialiser.h | 4 +
glib/gvariant.c | 7 +--
glib/gvarianttype.c | 7 +--
glib/gvarianttypeinfo.c | 11 +---
glib/gvarianttypeinfo.h | 4 +
glib/gwin32.c | 6 +--
glib/makegalias.pl | 136 --------------------------------------------
glib/pcre/pcre.h | 1 -
glib/pltcheck.sh | 10 +---
gthread/tests/1bit-mutex.c | 1 -
80 files changed, 133 insertions(+), 589 deletions(-)
---
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 287301e..7d03aab 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -35,18 +35,11 @@ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"GLib\" \
$(GLIB_DEBUG_FLAGS) \
-DG_DISABLE_DEPRECATED \
- -DGLIB_COMPILATION \
-DPCRE_STATIC
glib.def: glib.symbols
(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: $(srcdir)/makegalias.pl glib.symbols
- $(PERL) $(srcdir)/makegalias.pl < $(srcdir)/glib.symbols > galias.h
-
-galiasdef.c: $(srcdir)/makegalias.pl glib.symbols
- $(PERL) $(srcdir)/makegalias.pl -def < $(srcdir)/glib.symbols > galiasdef.c
-
if OS_LINUX
if HAVE_GNUC_VISIBILITY
TESTS_ENVIRONMENT = GLIB_DEBUG_FLAGS="$(GLIB_DEBUG_FLAGS)"
@@ -54,8 +47,6 @@ TESTS = abicheck.sh pltcheck.sh
endif
endif
-BUILT_SOURCES = galias.h galiasdef.c
-
MIRRORING_TAB_SOURCE = \
glib-mirroring-tab/Makefile \
glib-mirroring-tab/gen-mirroring-tab.c \
diff --git a/glib/garray.c b/glib/garray.c
index a2bca94..681352f 100644
--- a/glib/garray.c
+++ b/glib/garray.c
@@ -28,7 +28,7 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <string.h>
#include <stdlib.h>
@@ -40,8 +40,6 @@
#include "gmessages.h"
#include "gqsort.h"
-#include "galias.h"
-
/**
* SECTION: arrays
* @title: Arrays
@@ -1591,6 +1589,3 @@ 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 65e95a8..3f76ab5 100644
--- a/glib/gasyncqueue.c
+++ b/glib/gasyncqueue.c
@@ -24,11 +24,9 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "glib.h"
-#include "galias.h"
-
struct _GAsyncQueue
{
@@ -661,6 +659,3 @@ _g_async_queue_get_mutex (GAsyncQueue* queue)
return queue->mutex;
}
-
-#define __G_ASYNCQUEUE_C__
-#include "galiasdef.c"
diff --git a/glib/gatomic-gcc.c b/glib/gatomic-gcc.c
index 7b33b19..d7e1936 100644
--- a/glib/gatomic-gcc.c
+++ b/glib/gatomic-gcc.c
@@ -18,10 +18,9 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "glib.h"
-#include "galias.h"
gint
g_atomic_int_exchange_and_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
@@ -87,6 +86,3 @@ void
*atomic = newval;
__sync_synchronize ();
}
-
-#define __G_ATOMIC_C__
-#include "galiasdef.c"
diff --git a/glib/gatomic.c b/glib/gatomic.c
index baa73e7..0a451bc 100644
--- a/glib/gatomic.c
+++ b/glib/gatomic.c
@@ -21,7 +21,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#if defined (G_ATOMIC_ARM)
#include <sched.h>
@@ -29,7 +29,6 @@
#include "glib.h"
#include "gthreadprivate.h"
-#include "galias.h"
#if defined (__GNUC__)
# if defined (G_ATOMIC_I486)
@@ -1053,6 +1052,3 @@ void
g_atomic_pointer_set (atomic, newval);
}
#endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
-
-#define __G_ATOMIC_C__
-#include "galiasdef.c"
diff --git a/glib/gbacktrace.c b/glib/gbacktrace.c
index 238d9cf..e62a7f1 100644
--- a/glib/gbacktrace.c
+++ b/glib/gbacktrace.c
@@ -29,7 +29,7 @@
* then
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <signal.h>
#include <stdarg.h>
@@ -77,8 +77,6 @@
# endif
#endif
-#include "galias.h"
-
#ifndef G_OS_WIN32
static void stack_trace (char **args);
#endif
@@ -303,6 +301,3 @@ stack_trace (char **args)
}
#endif /* !G_OS_WIN32 */
-
-#define __G_BACKTRACE_C__
-#include "galiasdef.c"
diff --git a/glib/gbase64.c b/glib/gbase64.c
index 59a911a..799adf9 100644
--- a/glib/gbase64.c
+++ b/glib/gbase64.c
@@ -23,7 +23,7 @@
* Jeffrey Stedfast <fejj ximian com>
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <string.h>
@@ -31,8 +31,6 @@
#include "glib.h"
#include "glibintl.h"
-#include "galias.h"
-
/**
* SECTION:base64 Base64 Encoding
* @short_description: encodes and decodes data in Base64 format
@@ -441,7 +439,3 @@ g_base64_decode_inplace (gchar *text,
return (guchar *) text;
}
-
-
-#define __G_BASE64_C__
-#include "galiasdef.c"
diff --git a/glib/gbitlock.c b/glib/gbitlock.c
index 915aa7c..0faf5d3 100644
--- a/glib/gbitlock.c
+++ b/glib/gbitlock.c
@@ -20,6 +20,8 @@
* Author: Ryan Lortie <desrt desrt ca>
*/
+#include "glib-compilation.h"
+
#include "gbitlock.h"
#include <glib/gatomic.h>
@@ -27,9 +29,6 @@
#include <glib/gthread.h>
#include "gthreadprivate.h"
-#include "config.h"
-
-#include "galias.h"
#ifdef G_BIT_LOCK_FORCE_FUTEX_EMULATION
#undef HAVE_FUTEX
@@ -295,6 +294,3 @@ g_bit_unlock (volatile gint *address,
if (g_atomic_int_get (&g_bit_lock_contended[class]))
g_futex_wake (address);
}
-
-#define __G_BITLOCK_C__
-#include "galiasdef.c"
diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c
index 01c7e63..d208946 100644
--- a/glib/gbookmarkfile.c
+++ b/glib/gbookmarkfile.c
@@ -17,7 +17,7 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "gbookmarkfile.h"
@@ -55,8 +55,6 @@
#include "gtimer.h"
#include "gutils.h"
-#include "galias.h"
-
/* XBEL 1.0 standard entities */
#define XBEL_VERSION "1.0"
#define XBEL_DTD_NICK "xbel"
@@ -295,8 +293,8 @@ bookmark_metadata_new (void)
retval->groups = NULL;
retval->applications = NULL;
- retval->apps_by_name = g_hash_table_new_full (g_str_hash,
- g_str_equal,
+ retval->apps_by_name = g_hash_table_new_full (G_INTERNAL_FUNC(g_str_hash),
+ G_INTERNAL_FUNC(g_str_equal),
NULL,
NULL);
@@ -319,7 +317,7 @@ bookmark_metadata_free (BookmarkMetadata *metadata)
if (metadata->groups)
{
g_list_foreach (metadata->groups,
- (GFunc) g_free,
+ (GFunc) G_INTERNAL_FUNC(g_free),
NULL);
g_list_free (metadata->groups);
}
@@ -632,8 +630,8 @@ g_bookmark_file_init (GBookmarkFile *bookmark)
bookmark->description = NULL;
bookmark->items = NULL;
- bookmark->items_by_uri = g_hash_table_new_full (g_str_hash,
- g_str_equal,
+ bookmark->items_by_uri = g_hash_table_new_full (G_INTERNAL_FUNC(g_str_hash),
+ G_INTERNAL_FUNC(g_str_equal),
NULL,
NULL);
}
@@ -680,9 +678,10 @@ parse_data_new (void)
retval = g_new (ParseData, 1);
retval->state = STATE_STARTED;
- retval->namespaces = g_hash_table_new_full (g_str_hash, g_str_equal,
- (GDestroyNotify) g_free,
- (GDestroyNotify) g_free);
+ retval->namespaces = g_hash_table_new_full (G_INTERNAL_FUNC(g_str_hash),
+ G_INTERNAL_FUNC(g_str_equal),
+ (GDestroyNotify) G_INTERNAL_FUNC(g_free),
+ (GDestroyNotify) G_INTERNAL_FUNC(g_free));
retval->bookmark_file = NULL;
retval->current_item = NULL;
@@ -2895,7 +2894,7 @@ g_bookmark_file_set_groups (GBookmarkFile *bookmark,
if (item->metadata->groups != NULL)
{
g_list_foreach (item->metadata->groups,
- (GFunc) g_free,
+ (GFunc) G_INTERNAL_FUNC(g_free),
NULL);
g_list_free (item->metadata->groups);
item->metadata->groups = NULL;
@@ -3704,6 +3703,3 @@ g_bookmark_file_get_icon (GBookmarkFile *bookmark,
return TRUE;
}
-
-#define __G_BOOKMARK_FILE_C__
-#include "galiasdef.c"
diff --git a/glib/gbuffer.c b/glib/gbuffer.c
index 4eb83df..4c75544 100644
--- a/glib/gbuffer.c
+++ b/glib/gbuffer.c
@@ -19,7 +19,7 @@
* Author: Ryan Lortie <desrt desrt ca>
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "gbuffer.h"
@@ -27,8 +27,6 @@
#include <glib/gatomic.h>
#include <glib/gmem.h>
-#include "galias.h"
-
typedef struct
{
GBuffer buffer;
diff --git a/glib/gcache.c b/glib/gcache.c
index 9c69122..a8518ce 100644
--- a/glib/gcache.c
+++ b/glib/gcache.c
@@ -28,10 +28,9 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "glib.h"
-#include "galias.h"
/**
* SECTION: caches
@@ -326,6 +325,3 @@ g_cache_value_foreach (GCache *cache,
g_hash_table_foreach (cache->key_table, func, user_data);
}
-
-#define __G_CACHE_C__
-#include "galiasdef.c"
diff --git a/glib/gchecksum.c b/glib/gchecksum.c
index ad90727..5084750 100644
--- a/glib/gchecksum.c
+++ b/glib/gchecksum.c
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <string.h>
@@ -27,8 +27,6 @@
#include "glib.h"
#include "glibintl.h"
-#include "galias.h"
-
/**
* SECTION: checksum
* @title: Data Checksums
@@ -1456,6 +1454,3 @@ g_compute_checksum_for_string (GChecksumType checksum_type,
return g_compute_checksum_for_data (checksum_type, (const guchar *) str, length);
}
-
-#define __G_CHECKSUM_C__
-#include "galiasdef.c"
diff --git a/glib/gcompletion.c b/glib/gcompletion.c
index 904f850..80eded9 100644
--- a/glib/gcompletion.c
+++ b/glib/gcompletion.c
@@ -28,12 +28,11 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <string.h>
#include "glib.h"
-#include "galias.h"
/**
* SECTION: completion
@@ -467,6 +466,3 @@ main (int argc,
return 0;
}
#endif
-
-#define __G_COMPLETION_C__
-#include "galiasdef.c"
diff --git a/glib/gconvert.c b/glib/gconvert.c
index 5ec8f1d..1df5f24 100644
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -20,7 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "glib.h"
@@ -55,8 +55,6 @@
#error GNU libiconv not in use but included iconv.h is from libiconv
#endif
-#include "galias.h"
-
/* We try to terminate strings in unknown charsets with this many zero bytes
* to ensure that multibyte strings really are nul-terminated when we return
* them from g_convert() and friends.
@@ -235,7 +233,7 @@ iconv_cache_init (void)
iconv_cache_list = NULL;
iconv_cache = g_hash_table_new (g_str_hash, g_str_equal);
- iconv_open_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
+ iconv_open_hash = g_hash_table_new (G_INTERNAL_FUNC(g_direct_hash), G_INTERNAL_FUNC(g_direct_equal));
initialized = TRUE;
}
@@ -2125,6 +2123,3 @@ 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 ffc4b96..eeaabd5 100644
--- a/glib/gdataset.c
+++ b/glib/gdataset.c
@@ -30,13 +30,12 @@
* MT safe ; except for g_data*_foreach()
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <string.h>
#include "glib.h"
#include "gdatasetprivate.h"
-#include "galias.h"
/**
* SECTION: datasets
@@ -936,7 +935,7 @@ g_data_initialize (void)
{
g_return_if_fail (g_dataset_location_ht == NULL);
- g_dataset_location_ht = g_hash_table_new (g_direct_hash, NULL);
+ g_dataset_location_ht = g_hash_table_new (G_INTERNAL_FUNC(g_direct_hash), NULL);
g_dataset_cached = NULL;
}
@@ -1110,7 +1109,8 @@ g_quark_new (gchar *string)
if (!g_quark_ht)
{
g_assert (g_quark_seq_id == 0);
- g_quark_ht = g_hash_table_new (g_str_hash, g_str_equal);
+ g_quark_ht = g_hash_table_new (G_INTERNAL_FUNC(g_str_hash),
+ G_INTERNAL_FUNC(g_str_equal));
g_quarks[g_quark_seq_id++] = NULL;
}
@@ -1178,6 +1178,3 @@ g_intern_static_string (const gchar *string)
return result;
}
-
-#define __G_DATASET_C__
-#include "galiasdef.c"
diff --git a/glib/gdate.c b/glib/gdate.c
index b31c033..f71b0a6 100644
--- a/glib/gdate.c
+++ b/glib/gdate.c
@@ -28,7 +28,7 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#define DEBUG_MSG(x) /* */
#ifdef G_ENABLE_DEBUG
@@ -46,8 +46,6 @@
#include <windows.h>
#endif
-#include "galias.h"
-
GDate*
g_date_new (void)
{
@@ -1899,7 +1897,3 @@ g_date_strftime (gchar *s,
return retval;
#endif
}
-
-#define __G_DATE_C__
-#include "galiasdef.c"
-
diff --git a/glib/gdir.c b/glib/gdir.c
index c6997ae..59153ad 100644
--- a/glib/gdir.c
+++ b/glib/gdir.c
@@ -22,7 +22,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <errno.h>
#include <string.h>
@@ -39,8 +39,6 @@
#include "glibintl.h"
-#include "galias.h"
-
#if defined (_MSC_VER) && !defined (HAVE_DIRENT_H)
#include "../build/win32/dirent/dirent.h"
#include "../build/win32/dirent/wdirent.c"
@@ -302,6 +300,3 @@ g_dir_close (GDir *dir)
#endif
g_free (dir);
}
-
-#define __G_DIR_C__
-#include "galiasdef.c"
diff --git a/glib/gerror.c b/glib/gerror.c
index 4327f9a..29c70ac 100644
--- a/glib/gerror.c
+++ b/glib/gerror.c
@@ -24,11 +24,9 @@
* GLib at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "glib.h"
-#include "galias.h"
-
/**
* g_error_new_valist:
@@ -384,6 +382,3 @@ g_propagate_prefixed_error (GError **dest,
va_end (ap);
}
}
-
-#define __G_ERROR_C__
-#include "galiasdef.c"
diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index 76335fa..dc59c4b 100644
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "glib.h"
@@ -52,8 +52,6 @@
#include "gstdio.h"
#include "glibintl.h"
-#include "galias.h"
-
/**
* g_mkdir_with_parents:
* @pathname: a pathname in the GLib file name encoding
@@ -2015,6 +2013,3 @@ g_file_open_tmp (const gchar *tmpl,
}
#endif
-
-#define __G_FILEUTILS_C__
-#include "galiasdef.c"
diff --git a/glib/ghash.c b/glib/ghash.c
index f8c2936..4ce6865 100644
--- a/glib/ghash.c
+++ b/glib/ghash.c
@@ -28,12 +28,11 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <string.h> /* memset */
#include "glib.h"
-#include "galias.h"
/**
* SECTION: hash_tables
@@ -627,7 +626,7 @@ g_hash_table_new_full (GHashFunc hash_func,
g_hash_table_set_shift (hash_table, HASH_TABLE_MIN_SHIFT);
hash_table->nnodes = 0;
hash_table->noccupied = 0;
- hash_table->hash_func = hash_func ? hash_func : g_direct_hash;
+ hash_table->hash_func = hash_func ? hash_func : G_INTERNAL_FUNC(g_direct_hash);
hash_table->key_equal_func = key_equal_func;
hash_table->ref_count = 1;
#ifndef G_DISABLE_ASSERT
@@ -1456,6 +1455,3 @@ g_hash_table_get_values (GHashTable *hash_table)
return retval;
}
-
-#define __G_HASH_C__
-#include "galiasdef.c"
diff --git a/glib/ghook.c b/glib/ghook.c
index d038ee2..63def29 100644
--- a/glib/ghook.c
+++ b/glib/ghook.c
@@ -31,11 +31,9 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "glib.h"
-#include "galias.h"
-
/* --- functions --- */
static void
@@ -633,6 +631,3 @@ g_hook_compare_ids (GHook *new_hook,
return 0;
}
-
-#define __G_HOOK_C__
-#include "galiasdef.c"
diff --git a/glib/ghostutils.c b/glib/ghostutils.c
index 3871456..2054db0 100644
--- a/glib/ghostutils.c
+++ b/glib/ghostutils.c
@@ -19,15 +19,13 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "glib.h"
#include "glibintl.h"
#include <string.h>
-#include "galias.h"
-
/**
* SECTION:ghostutils
* @short_description: Internet hostname utilities
@@ -764,6 +762,3 @@ g_hostname_is_ip_address (const gchar *hostname)
/* If there's nothing left to parse, then it's ok. */
return !*p;
}
-
-#define __G_HOST_UTILS_C__
-#include "galiasdef.c"
diff --git a/glib/giochannel.c b/glib/giochannel.c
index 68acd60..889d940 100644
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -31,7 +31,7 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <string.h>
#include <errno.h>
@@ -48,8 +48,6 @@
#include "glibintl.h"
-#include "galias.h"
-
/**
* SECTION: iochannels
* @title: IO Channels
@@ -2579,6 +2577,3 @@ g_io_channel_error_quark (void)
{
return g_quark_from_static_string ("g-io-channel-error-quark");
}
-
-#define __G_IOCHANNEL_C__
-#include "galiasdef.c"
diff --git a/glib/giounix.c b/glib/giounix.c
index 0e89d5c..6e11513 100644
--- a/glib/giounix.c
+++ b/glib/giounix.c
@@ -31,7 +31,7 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#define _POSIX_SOURCE /* for SSIZE_MAX */
@@ -44,7 +44,6 @@
#include <fcntl.h>
#include "glib.h"
-#include "galias.h"
/*
* Unix IO Channels
@@ -640,6 +639,3 @@ 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 ae2dcde..a2583c3 100644
--- a/glib/giowin32.c
+++ b/glib/giowin32.c
@@ -67,7 +67,7 @@
* above bugs continue to work.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "glib.h"
@@ -84,8 +84,6 @@
#include "gstdio.h"
#include "glibintl.h"
-#include "galias.h"
-
typedef struct _GIOWin32Channel GIOWin32Channel;
typedef struct _GIOWin32Watch GIOWin32Watch;
@@ -2239,6 +2237,3 @@ g_io_channel_win32_new_stream_socket (int socket)
}
#endif
-
-#define __G_IO_WIN32_C__
-#include "galiasdef.c"
diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index 2226e70..774a785 100644
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -21,7 +21,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "gkeyfile.h"
@@ -63,8 +63,6 @@
#include "gstrfuncs.h"
#include "gutils.h"
-#include "galias.h"
-
typedef struct _GKeyFileGroup GKeyFileGroup;
struct _GKeyFile
@@ -205,7 +203,7 @@ g_key_file_init (GKeyFile *key_file)
{
key_file->current_group = g_slice_new0 (GKeyFileGroup);
key_file->groups = g_list_prepend (NULL, key_file->current_group);
- key_file->group_hash = g_hash_table_new (g_str_hash, g_str_equal);
+ key_file->group_hash = g_hash_table_new (G_INTERNAL_FUNC(g_str_hash), G_INTERNAL_FUNC(g_str_equal));
key_file->start_group = NULL;
key_file->parse_buffer = g_string_sized_new (128);
key_file->approximate_size = 0;
@@ -3018,7 +3016,7 @@ g_key_file_add_group (GKeyFile *key_file,
group = g_slice_new0 (GKeyFileGroup);
group->name = g_strdup (group_name);
- group->lookup_map = g_hash_table_new (g_str_hash, g_str_equal);
+ group->lookup_map = g_hash_table_new (G_INTERNAL_FUNC(g_str_hash), G_INTERNAL_FUNC(g_str_equal));
key_file->groups = g_list_prepend (key_file->groups, group);
key_file->approximate_size += strlen (group_name) + 3;
key_file->current_group = group;
@@ -3777,6 +3775,3 @@ g_key_file_parse_comment_as_value (GKeyFile *key_file,
return g_string_free (string, FALSE);
}
-
-#define __G_KEY_FILE_C__
-#include "galiasdef.c"
diff --git a/glib/glist.c b/glib/glist.c
index 252330a..f90a6ca 100644
--- a/glib/glist.c
+++ b/glib/glist.c
@@ -28,10 +28,9 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "glib.h"
-#include "galias.h"
/**
* SECTION: linked_lists_double
@@ -1148,6 +1147,3 @@ g_list_sort_with_data (GList *list,
{
return g_list_sort_real (list, (GFunc) compare_func, user_data);
}
-
-#define __G_LIST_C__
-#include "galiasdef.c"
diff --git a/glib/gmacros.h b/glib/gmacros.h
index b3ff7ee..0d978ae 100644
--- a/glib/gmacros.h
+++ b/glib/gmacros.h
@@ -161,7 +161,7 @@
#ifdef __cplusplus
# define G_BEGIN_DECLS extern "C" {
# define G_END_DECLS }
-#else
+#elif !defined (G_BEGIN_DECLS)
# define G_BEGIN_DECLS
# define G_END_DECLS
#endif
diff --git a/glib/gmain.c b/glib/gmain.c
index e04c7b5..9608231 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -31,7 +31,7 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
/* Uncomment the next line (and the corresponding line in gpoll.c) to
* enable debugging printouts if the environment variable
@@ -77,8 +77,6 @@
#include <sys/wait.h>
#endif
-#include "galias.h"
-
/* Types */
typedef struct _GTimeoutSource GTimeoutSource;
@@ -496,7 +494,7 @@ g_main_context_new (void)
context->source_list = NULL;
- context->poll_func = g_poll;
+ context->poll_func = G_INTERNAL_FUNC(g_poll);
context->cached_poll_array = NULL;
context->cached_poll_array_size = 0;
@@ -3146,7 +3144,7 @@ g_main_context_set_poll_func (GMainContext *context,
if (func)
context->poll_func = func;
else
- context->poll_func = g_poll;
+ context->poll_func = G_INTERNAL_FUNC(g_poll);
UNLOCK_CONTEXT (context);
}
@@ -4167,6 +4165,3 @@ 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/gmappedfile.c b/glib/gmappedfile.c
index 9bf7146..2d16df6 100644
--- a/glib/gmappedfile.c
+++ b/glib/gmappedfile.c
@@ -19,7 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <errno.h>
#include <sys/types.h>
@@ -56,8 +56,6 @@
#include "glibintl.h"
-#include "galias.h"
-
#ifndef _O_BINARY
#define _O_BINARY 0
#endif
@@ -342,6 +340,3 @@ g_mapped_file_unref (GMappedFile *file)
if (g_atomic_int_dec_and_test (&file->ref_count))
g_mapped_file_destroy (file);
}
-
-#define __G_MAPPED_FILE_C__
-#include "galiasdef.c"
diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index 74be8cb..b7cc786 100644
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -19,7 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <stdarg.h>
#include <string.h>
@@ -29,7 +29,6 @@
#include "glib.h"
#include "glibintl.h"
-#include "galias.h"
GQuark
g_markup_error_quark (void)
@@ -2780,6 +2779,3 @@ failure:
return FALSE;
}
-
-#define __G_MARKUP_C__
-#include "galiasdef.c"
diff --git a/glib/gmem.c b/glib/gmem.c
index 36e04dd..4a882cc 100644
--- a/glib/gmem.c
+++ b/glib/gmem.c
@@ -28,7 +28,7 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <stdlib.h>
#include <string.h>
@@ -37,8 +37,6 @@
#include "glib.h"
#include "gthreadprivate.h"
-#include "galias.h"
-
#define MEM_PROFILE_TABLE_SIZE 4096
@@ -190,6 +188,7 @@ g_free (gpointer mem)
if (G_LIKELY (mem))
glib_mem_vtable.free (mem);
}
+G_DEFINE_INTERNAL_FUNC(g_free);
gpointer
g_try_malloc (gsize n_bytes)
@@ -1164,6 +1163,3 @@ _g_mem_thread_init_noprivate_nomessage (void)
gmem_profile_mutex = g_mutex_new ();
#endif
}
-
-#define __G_MEM_C__
-#include "galiasdef.c"
diff --git a/glib/gmessages.c b/glib/gmessages.c
index 9a3eec3..c29c7e5 100644
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -28,7 +28,7 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -45,7 +45,6 @@
#include "gdebug.h"
#include "gprintfint.h"
#include "gthreadprivate.h"
-#include "galias.h"
#ifdef G_OS_WIN32
#include <process.h> /* For getpid() */
@@ -1161,6 +1160,3 @@ _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 7d3dfce..9783e2a 100644
--- a/glib/gnode.c
+++ b/glib/gnode.c
@@ -31,10 +31,9 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "glib.h"
-#include "galias.h"
/**
* SECTION: trees-nary
@@ -1276,6 +1275,3 @@ g_node_children_foreach (GNode *node,
}
}
}
-
-#define __G_NODE_C__
-#include "galiasdef.c"
diff --git a/glib/goption.c b/glib/goption.c
index 9747d47..1903483 100644
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -125,15 +125,13 @@
* </programlisting></informalexample>
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "goption.h"
#include "glib.h"
#include "glibintl.h"
#include "gprintf.h"
-#include "galias.h"
-
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
@@ -351,7 +349,7 @@ void g_option_context_free (GOptionContext *context)
{
g_return_if_fail (context != NULL);
- g_list_foreach (context->groups, (GFunc)g_option_group_free, NULL);
+ g_list_foreach (context->groups, (GFunc)G_INTERNAL_FUNC(g_option_group_free), NULL);
g_list_free (context->groups);
if (context->main_group)
@@ -775,7 +773,7 @@ g_option_context_get_help (GOptionContext *context,
}
memset (seen, 0, sizeof (gboolean) * 256);
- shadow_map = g_hash_table_new (g_str_hash, g_str_equal);
+ shadow_map = g_hash_table_new (G_INTERNAL_FUNC(g_str_hash), G_INTERNAL_FUNC(g_str_equal));
if (context->main_group)
{
@@ -2079,6 +2077,7 @@ g_option_group_free (GOptionGroup *group)
g_free (group);
}
+G_DEFINE_INTERNAL_FUNC(g_option_group_free);
/**
@@ -2230,7 +2229,7 @@ g_option_group_set_translation_domain (GOptionGroup *group,
g_option_group_set_translate_func (group,
(GTranslateFunc)dgettext_swapped,
g_strdup (domain),
- g_free);
+ G_INTERNAL_FUNC(g_free));
}
/**
@@ -2289,7 +2288,7 @@ g_option_context_set_translation_domain (GOptionContext *context,
g_option_context_set_translate_func (context,
(GTranslateFunc)dgettext_swapped,
g_strdup (domain),
- g_free);
+ G_INTERNAL_FUNC(g_free));
}
/**
@@ -2380,7 +2379,3 @@ g_option_context_get_description (GOptionContext *context)
return context->description;
}
-
-
-#define __G_OPTION_C__
-#include "galiasdef.c"
diff --git a/glib/gpattern.c b/glib/gpattern.c
index 33e4aac..d79a915 100644
--- a/glib/gpattern.c
+++ b/glib/gpattern.c
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <string.h>
@@ -28,7 +28,6 @@
#include "gmem.h"
#include "gunicode.h"
#include "gutils.h"
-#include "galias.h"
/**
* SECTION: patterns
@@ -441,6 +440,3 @@ g_pattern_match_simple (const gchar *pattern,
return ergo;
}
-
-#define __G_PATTERN_C__
-#include "galiasdef.c"
diff --git a/glib/gpoll.c b/glib/gpoll.c
index 30e5429..ee8a335 100644
--- a/glib/gpoll.c
+++ b/glib/gpoll.c
@@ -32,7 +32,7 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
/* Uncomment the next line (and the corresponding line in gmain.c) to
* enable debugging printouts if the environment variable
@@ -77,8 +77,6 @@
#include <windows.h>
#endif /* G_OS_WIN32 */
-#include "galias.h"
-
#ifdef G_MAIN_POLL_DEBUG
extern gboolean _g_main_poll_debug;
#endif
@@ -426,5 +424,4 @@ g_poll (GPollFD *fds,
#endif /* !HAVE_POLL */
-#define __G_POLL_C__
-#include "galiasdef.c"
+G_DEFINE_INTERNAL_FUNC(g_poll);
diff --git a/glib/gprimes.c b/glib/gprimes.c
index 7beca71..22d5d20 100644
--- a/glib/gprimes.c
+++ b/glib/gprimes.c
@@ -28,11 +28,9 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "glib.h"
-#include "galias.h"
-
static const guint g_primes[] =
{
@@ -85,6 +83,3 @@ 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 3528861..01b28ff 100644
--- a/glib/gprintf.c
+++ b/glib/gprintf.c
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#ifndef _WIN32
#define _GNU_SOURCE /* For vasprintf */
@@ -31,8 +31,6 @@
#include "gprintf.h"
#include "gprintfint.h"
-#include "galias.h"
-
/**
* g_printf:
* @format: a standard printf() format string, but notice
@@ -339,6 +337,3 @@ g_vasprintf (gchar **string,
return len;
}
-
-#define __G_PRINTF_C__
-#include "galiasdef.c"
diff --git a/glib/gqsort.c b/glib/gqsort.c
index 176d44a..ffe078b 100644
--- a/glib/gqsort.c
+++ b/glib/gqsort.c
@@ -32,14 +32,13 @@
* at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include "glib.h"
-#include "galias.h"
/* Byte-wise swap two items of size SIZE. */
#define SWAP(a, b, size) \
@@ -282,6 +281,3 @@ g_qsort_with_data (gconstpointer pbase,
}
}
}
-
-#define __G_QSORT_C__
-#include "galiasdef.c"
diff --git a/glib/gqueue.c b/glib/gqueue.c
index 1368e26..4e6d8d0 100644
--- a/glib/gqueue.c
+++ b/glib/gqueue.c
@@ -24,10 +24,9 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "glib.h"
-#include "galias.h"
/**
* g_queue_new:
@@ -1008,6 +1007,3 @@ 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 231ed13..35a6e86 100644
--- a/glib/grand.c
+++ b/glib/grand.c
@@ -36,7 +36,7 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <math.h>
#include <errno.h>
@@ -49,7 +49,6 @@
#include "glib.h"
#include "gthreadprivate.h"
-#include "galias.h"
#ifdef G_OS_WIN32
#include <process.h> /* For getpid() */
@@ -694,7 +693,3 @@ g_random_set_seed (guint32 seed)
g_rand_set_seed (global_random, seed);
G_UNLOCK (global_random);
}
-
-
-#define __G_RAND_C__
-#include "galiasdef.c"
diff --git a/glib/gregex.c b/glib/gregex.c
index 7e3448f..5fd3a54 100644
--- a/glib/gregex.c
+++ b/glib/gregex.c
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <string.h>
@@ -38,8 +38,6 @@
#define PCRE_ERROR_NULLWSLIMIT (-22)
#endif
-#include "galias.h"
-
/* Mask of all the possible values for GRegexCompileFlags. */
#define G_REGEX_COMPILE_MASK (G_REGEX_CASELESS | \
G_REGEX_MULTILINE | \
@@ -1909,7 +1907,7 @@ g_regex_split_full (const GRegex *regex,
if (tmp_error != NULL)
{
g_propagate_error (error, tmp_error);
- g_list_foreach (list, (GFunc)g_free, NULL);
+ g_list_foreach (list, (GFunc)G_INTERNAL_FUNC(g_free), NULL);
g_list_free (list);
match_info->pos = -1;
return NULL;
@@ -2753,6 +2751,3 @@ g_regex_escape_string (const gchar *string,
return g_string_free (escaped, FALSE);
}
-
-#define __G_REGEX_C__
-#include "galiasdef.c"
diff --git a/glib/grel.c b/glib/grel.c
index 8cecd29..c89df20 100644
--- a/glib/grel.c
+++ b/glib/grel.c
@@ -27,13 +27,12 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <stdarg.h>
#include <string.h>
#include "glib.h"
-#include "galias.h"
/**
* SECTION: relations
@@ -641,6 +640,3 @@ g_relation_print (GRelation *relation)
}
}
-
-#define __G_REL_C__
-#include "galiasdef.c"
diff --git a/glib/gscanner.c b/glib/gscanner.c
index 233cc73..80b5110 100644
--- a/glib/gscanner.c
+++ b/glib/gscanner.c
@@ -31,7 +31,7 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <errno.h>
#include <stdlib.h>
@@ -44,7 +44,6 @@
#include "glib.h"
#include "gprintfint.h"
-#include "galias.h"
#ifdef G_OS_WIN32
#include <io.h> /* For _read() */
@@ -324,6 +323,7 @@ g_scanner_error (GScanner *scanner,
g_free (string);
}
}
+G_DEFINE_INTERNAL_FUNC(g_scanner_error);
void
g_scanner_warn (GScanner *scanner,
@@ -347,6 +347,7 @@ g_scanner_warn (GScanner *scanner,
g_free (string);
}
}
+G_DEFINE_INTERNAL_FUNC(g_scanner_warn);
static gboolean
g_scanner_key_equal (gconstpointer v1,
@@ -840,9 +841,9 @@ g_scanner_unexp_token (GScanner *scanner,
g_return_if_fail (scanner != NULL);
if (is_error)
- msg_handler = g_scanner_error;
+ msg_handler = G_INTERNAL_FUNC(g_scanner_error);
else
- msg_handler = g_scanner_warn;
+ msg_handler = G_INTERNAL_FUNC(g_scanner_warn);
if (!identifier_spec)
identifier_spec = "identifier";
@@ -1762,6 +1763,3 @@ g_scanner_get_token_ll (GScanner *scanner,
*token_p = token;
*value_p = value;
}
-
-#define __G_SCANNER_C__
-#include "galiasdef.c"
diff --git a/glib/gsequence.c b/glib/gsequence.c
index ee00708..60e76f4 100644
--- a/glib/gsequence.c
+++ b/glib/gsequence.c
@@ -18,10 +18,9 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "glib.h"
-#include "galias.h"
/**
* SECTION: sequence
@@ -1813,7 +1812,3 @@ node_insert_sorted (GSequenceNode *node,
node_insert_before (closest, new);
}
-
-
-#define __G_SEQUENCE_C__
-#include "galiasdef.c"
diff --git a/glib/gshell.c b/glib/gshell.c
index d3b76f4..735e081 100644
--- a/glib/gshell.c
+++ b/glib/gshell.c
@@ -20,7 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <string.h>
@@ -31,7 +31,6 @@
#endif
#include "glibintl.h"
-#include "galias.h"
/**
* SECTION: shell
@@ -591,7 +590,7 @@ tokenize_command_line (const gchar *command_line,
if (retval)
{
- g_slist_foreach (retval, (GFunc)g_free, NULL);
+ g_slist_foreach (retval, (GFunc)G_INTERNAL_FUNC(g_free), NULL);
g_slist_free (retval);
}
@@ -668,7 +667,7 @@ g_shell_parse_argv (const gchar *command_line,
++i;
}
- g_slist_foreach (tokens, (GFunc)g_free, NULL);
+ g_slist_foreach (tokens, (GFunc)G_INTERNAL_FUNC(g_free), NULL);
g_slist_free (tokens);
if (argcp)
@@ -685,11 +684,8 @@ g_shell_parse_argv (const gchar *command_line,
g_assert (error == NULL || *error != NULL);
g_strfreev (argv);
- g_slist_foreach (tokens, (GFunc) g_free, NULL);
+ g_slist_foreach (tokens, (GFunc) G_INTERNAL_FUNC(g_free), NULL);
g_slist_free (tokens);
return FALSE;
}
-
-#define __G_SHELL_C__
-#include "galiasdef.c"
diff --git a/glib/gslice.c b/glib/gslice.c
index 66fd9e5..576a989 100644
--- a/glib/gslice.c
+++ b/glib/gslice.c
@@ -18,7 +18,7 @@
*/
/* MT safe */
-#include "config.h"
+#include "glib-compilation.h"
#include "gslice.h"
@@ -35,7 +35,6 @@
#include "gmem.h" /* gslice.h */
#include "gthreadprivate.h"
#include "glib.h"
-#include "galias.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h> /* sysconf() */
#endif
@@ -1483,6 +1482,3 @@ g_slice_debug_tree_statistics (void)
*/
}
#endif /* G_ENABLE_DEBUG */
-
-#define __G_SLICE_C__
-#include "galiasdef.c"
diff --git a/glib/gslist.c b/glib/gslist.c
index 5dcbc7f..b5910ad 100644
--- a/glib/gslist.c
+++ b/glib/gslist.c
@@ -28,10 +28,9 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "glib.h"
-#include "galias.h"
/**
* SECTION: linked_lists_single
@@ -1056,6 +1055,3 @@ g_slist_sort_with_data (GSList *list,
{
return g_slist_sort_real (list, (GFunc) compare_func, user_data);
}
-
-#define __G_SLIST_C__
-#include "galiasdef.c"
diff --git a/glib/gspawn-win32-helper.c b/glib/gspawn-win32-helper.c
index 40108bb..3d5f3b5 100644
--- a/glib/gspawn-win32-helper.c
+++ b/glib/gspawn-win32-helper.c
@@ -19,7 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <fcntl.h>
diff --git a/glib/gspawn-win32.c b/glib/gspawn-win32.c
index dc48a25..2e52aec 100644
--- a/glib/gspawn-win32.c
+++ b/glib/gspawn-win32.c
@@ -42,12 +42,11 @@
/* Define this to get some logging all the time */
/* #define G_SPAWN_WIN32_DEBUG */
-#include "config.h"
+#include "glib-compilation.h"
#include "glib.h"
#include "gprintfint.h"
#include "glibintl.h"
-#include "galias.h"
#include <string.h>
#include <stdlib.h>
@@ -1492,6 +1491,3 @@ g_spawn_command_line_async (const gchar *command_line,
#endif /* !_WIN64 */
#endif /* !GSPAWN_HELPER */
-
-#define __G_SPAWN_C__
-#include "galiasdef.c"
diff --git a/glib/gspawn.c b/glib/gspawn.c
index 1425450..ec9fcba 100644
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -20,7 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <sys/time.h>
#include <sys/types.h>
@@ -43,7 +43,6 @@
#include "glib.h"
#include "glibintl.h"
-#include "galias.h"
static gint g_execute (const gchar *file,
gchar **argv,
@@ -1677,6 +1676,3 @@ 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 542a95e..79cdab9 100644
--- a/glib/gstdio.c
+++ b/glib/gstdio.c
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#define G_STDIO_NO_WRAP_ON_UNIX
@@ -45,8 +45,6 @@
#include "gstdio.h"
-#include "galias.h"
-
#if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) && !defined (G_OS_BEOS)
#error Please port this to your operating system
#endif
@@ -820,6 +818,3 @@ g_utime (const gchar *filename,
return utime (filename, utb);
#endif
}
-
-#define __G_STDIO_C__
-#include "galiasdef.c"
diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 8e4b226..f7631b4 100644
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -28,7 +28,7 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#define _GNU_SOURCE /* For stpcpy */
@@ -48,8 +48,6 @@
#include "gprintfint.h"
#include "glibintl.h"
-#include "galias.h"
-
#ifdef G_OS_WIN32
#include <windows.h>
#endif
@@ -1378,7 +1376,7 @@ g_strerror (gint errnum)
if (!msg)
{
msg = g_new (gchar, 64);
- g_static_private_set (&msg_private, msg, g_free);
+ g_static_private_set (&msg_private, msg, G_INTERNAL_FUNC(g_free));
}
_g_sprintf (msg, "unknown error (%d)", errnum);
@@ -1542,7 +1540,7 @@ extern const char *strsignal(int);
if (!msg)
{
msg = g_new (gchar, 64);
- g_static_private_set (&msg_private, msg, g_free);
+ g_static_private_set (&msg_private, msg, G_INTERNAL_FUNC(g_free));
}
_g_sprintf (msg, "unknown signal (%d)", signum);
@@ -3243,7 +3241,3 @@ g_dngettext (const gchar *domain,
return dngettext (domain, msgid, msgid_plural, n);
}
-
-
-#define __G_STRFUNCS_C__
-#include "galiasdef.c"
diff --git a/glib/gstring.c b/glib/gstring.c
index aaff031..6f3319b 100644
--- a/glib/gstring.c
+++ b/glib/gstring.c
@@ -28,7 +28,7 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@ -42,8 +42,6 @@
#include "glib.h"
#include "gprintf.h"
-#include "galias.h"
-
/**
* SECTION: string_chunks
* @title: String Chunks
@@ -115,6 +113,7 @@ g_str_equal (gconstpointer v1,
return strcmp (string1, string2) == 0;
}
+G_DEFINE_INTERNAL_FUNC(g_str_equal);
/**
* g_str_hash:
@@ -139,6 +138,7 @@ g_str_hash (gconstpointer v)
return h;
}
+G_DEFINE_INTERNAL_FUNC(g_str_hash);
#define MY_MAXSIZE ((gsize)-1)
@@ -313,7 +313,7 @@ g_string_chunk_insert_const (GStringChunk *chunk,
g_return_val_if_fail (chunk != NULL, NULL);
if (!chunk->const_table)
- chunk->const_table = g_hash_table_new (g_str_hash, g_str_equal);
+ chunk->const_table = g_hash_table_new (G_INTERNAL_FUNC(g_str_hash), G_INTERNAL_FUNC(g_str_equal));
lookup = (char*) g_hash_table_lookup (chunk->const_table, (gchar *)string);
@@ -1516,6 +1516,3 @@ g_string_append_printf (GString *string,
g_string_append_vprintf (string, format, args);
va_end (args);
}
-
-#define __G_STRING_C__
-#include "galiasdef.c"
diff --git a/glib/gtestutils.c b/glib/gtestutils.c
index a6888de..b430077 100644
--- a/glib/gtestutils.c
+++ b/glib/gtestutils.c
@@ -17,10 +17,9 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "gtestutils.h"
#include <glib.h>
-#include "galias.h"
#include <sys/types.h>
#ifdef G_OS_UNIX
#include <sys/wait.h>
@@ -1080,7 +1079,7 @@ void
g_test_queue_free (gpointer gfree_pointer)
{
if (gfree_pointer)
- g_test_queue_destroy (g_free, gfree_pointer);
+ g_test_queue_destroy (G_INTERNAL_FUNC(g_free), gfree_pointer);
}
/**
@@ -2024,6 +2023,3 @@ g_test_log_msg_free (GTestLogMsg *tmsg)
* Since: 2.16
**/
/* --- macros docs END --- */
-
-#define __G_TEST_UTILS_C__
-#include "galiasdef.c"
diff --git a/glib/gthread.c b/glib/gthread.c
index 4689211..931583b 100644
--- a/glib/gthread.c
+++ b/glib/gthread.c
@@ -38,7 +38,7 @@
#define G_IMPLEMENT_INLINES 1
#define __G_THREAD_C__
-#include "config.h"
+#include "glib-compilation.h"
#include "glib.h"
#include "gthreadprivate.h"
@@ -56,8 +56,6 @@
#include <string.h>
-#include "galias.h"
-
/**
* SECTION: threads
* @title: Threads
@@ -2532,7 +2530,3 @@ g_thread_get_initialized ()
{
return g_thread_supported ();
}
-
-#define __G_THREAD_C__
-#include "galiasdef.c"
-
diff --git a/glib/gthreadpool.c b/glib/gthreadpool.c
index 3ece1b4..8fb0a81 100644
--- a/glib/gthreadpool.c
+++ b/glib/gthreadpool.c
@@ -24,10 +24,9 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "glib.h"
-#include "galias.h"
/**
* SECTION: thread_pools
@@ -101,7 +100,7 @@ struct _GRealThreadPool
/* The following is just an address to mark the wakeup order for a
* thread, it could be any address (as long, as it isn't a valid
* GThreadPool address) */
-static const gpointer wakeup_thread_marker = (gpointer) &g_thread_pool_new;
+static const gpointer wakeup_thread_marker = (gpointer) "";
static gint wakeup_thread_serial = 0;
/* Here all unused threads are waiting */
@@ -990,6 +989,3 @@ g_thread_pool_get_max_idle_time (void)
{
return g_atomic_int_get (&max_idle_time);
}
-
-#define __G_THREADPOOL_C__
-#include "galiasdef.c"
diff --git a/glib/gtimer.c b/glib/gtimer.c
index 91f3f8a..1757017 100644
--- a/glib/gtimer.c
+++ b/glib/gtimer.c
@@ -28,7 +28,7 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "glibconfig.h"
#include <stdlib.h>
@@ -49,7 +49,6 @@
#include "glib.h"
#include "gthread.h"
-#include "galias.h"
/**
* SECTION: timers
@@ -563,6 +562,3 @@ g_time_val_to_iso8601 (GTimeVal *time_)
return retval;
}
-
-#define __G_TIMER_C__
-#include "galiasdef.c"
diff --git a/glib/gtree.c b/glib/gtree.c
index 17bfb82..f36ec3e 100644
--- a/glib/gtree.c
+++ b/glib/gtree.c
@@ -28,10 +28,9 @@
* MT safe
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "glib.h"
-#include "galias.h"
/**
* SECTION: trees-binary
@@ -1410,8 +1409,3 @@ g_tree_dump (GTree *tree)
g_tree_node_dump (tree->root, 0);
}
#endif
-
-
-#define __G_TREE_C__
-#include "galiasdef.c"
-
diff --git a/glib/gunibreak.c b/glib/gunibreak.c
index 9c12921..5872d40 100644
--- a/glib/gunibreak.c
+++ b/glib/gunibreak.c
@@ -18,13 +18,12 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <stdlib.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,6 +60,3 @@ 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 2bf579e..5b8e2fe 100644
--- a/glib/gunicollate.c
+++ b/glib/gunicollate.c
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <locale.h>
#include <string.h>
@@ -32,7 +32,6 @@
#include "glib.h"
#include "gunicodeprivate.h"
-#include "galias.h"
#ifdef _MSC_VER
/* Workaround for bug in MSVCR80.DLL */
@@ -673,7 +672,3 @@ g_utf8_collate_key_for_filename (const gchar *str,
return carbon_collate_key_for_filename (str, len);
#endif
}
-
-
-#define __G_UNICOLLATE_C__
-#include "galiasdef.c"
diff --git a/glib/gunidecomp.c b/glib/gunidecomp.c
index d0fa97e..9be41e4 100644
--- a/glib/gunidecomp.c
+++ b/glib/gunidecomp.c
@@ -19,7 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <stdlib.h>
@@ -27,8 +27,6 @@
#include "gunidecomp.h"
#include "gunicomp.h"
#include "gunicodeprivate.h"
-#include "galias.h"
-
#define CC_PART1(Page, Char) \
((combining_class_table_part1[Page] >= G_UNICODE_MAX_TABLE_INDEX) \
@@ -530,6 +528,3 @@ 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 8a28513..e4abe75 100644
--- a/glib/guniprop.c
+++ b/glib/guniprop.c
@@ -19,7 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <stdlib.h>
#include <stddef.h>
@@ -31,7 +31,6 @@
#include "gmirroringtable.h"
#include "gscripttable.h"
#include "gunicodeprivate.h"
-#include "galias.h"
#define ATTR_TABLE(Page) (((Page) <= G_UNICODE_LAST_PAGE_PART1) \
? attr_table_part1[Page] \
@@ -1296,7 +1295,3 @@ g_unichar_get_script (gunichar ch)
else
return g_unichar_get_script_bsearch (ch);
}
-
-
-#define __G_UNIPROP_C__
-#include "galiasdef.c"
diff --git a/glib/gurifuncs.c b/glib/gurifuncs.c
index 5f1ef71..40bad0c 100644
--- a/glib/gurifuncs.c
+++ b/glib/gurifuncs.c
@@ -20,7 +20,7 @@
* Author: Alexander Larsson <alexl redhat com>
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "gurifuncs.h"
@@ -31,9 +31,6 @@
#include <string.h>
-#include "config.h"
-#include "galias.h"
-
/**
* SECTION:gurifuncs
* @short_description: URI Functions
@@ -248,6 +245,3 @@ g_uri_escape_string (const char *unescaped,
return g_string_free (s, FALSE);
}
-
-#define __G_URI_FUNCS_C__
-#include "galiasdef.c"
diff --git a/glib/gutf8.c b/glib/gutf8.c
index 27b1e4c..16044ce 100644
--- a/glib/gutf8.c
+++ b/glib/gutf8.c
@@ -19,7 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include <stdlib.h>
#ifdef HAVE_CODESET
@@ -39,7 +39,6 @@
#include "libcharset/libcharset.h"
#include "glibintl.h"
-#include "galias.h"
#define UTF8_COMPUTE(Char, Mask, Len) \
if (Char < 128) \
@@ -422,7 +421,7 @@ get_alias_hash (void)
if (!alias_hash)
{
- alias_hash = g_hash_table_new (g_str_hash, g_str_equal);
+ alias_hash = g_hash_table_new (G_INTERNAL_FUNC(g_str_hash), G_INTERNAL_FUNC(g_str_equal));
aliases = _g_locale_get_charset_aliases ();
while (*aliases != '\0')
@@ -1889,7 +1888,3 @@ _g_utf8_make_valid (const gchar *name)
return g_string_free (string, FALSE);
}
-
-
-#define __G_UTF8_C__
-#include "galiasdef.c"
diff --git a/glib/gutils.c b/glib/gutils.c
index 744663e..e637125 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -28,7 +28,7 @@
* MT safe for the unix part, FIXME: make the win32 part MT safe as well.
*/
-#include "config.h"
+#include "glib-compilation.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@ -61,7 +61,6 @@
#include "gprintfint.h"
#include "gthreadprivate.h"
#include "glibintl.h"
-#include "galias.h"
#ifdef MAXPATHLEN
#define G_PATH_LENGTH MAXPATHLEN
@@ -2859,7 +2858,7 @@ read_aliases (gchar *file)
char buf[256];
if (!alias_table)
- alias_table = g_hash_table_new (g_str_hash, g_str_equal);
+ alias_table = g_hash_table_new (G_INTERNAL_FUNC(g_str_hash), G_INTERNAL_FUNC(g_str_equal));
fp = fopen (file,"r");
if (!fp)
return;
@@ -3194,6 +3193,7 @@ g_direct_hash (gconstpointer v)
{
return GPOINTER_TO_UINT (v);
}
+G_DEFINE_INTERNAL_FUNC(g_direct_hash);
/**
* g_direct_equal:
@@ -3568,6 +3568,3 @@ g_get_tmp_dir (void)
}
#endif
-
-#define __G_UTILS_C__
-#include "galiasdef.c"
diff --git a/glib/gvariant-core.c b/glib/gvariant-core.c
index 183fa09..2243616 100644
--- a/glib/gvariant-core.c
+++ b/glib/gvariant-core.c
@@ -18,6 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
+#include "glib-compilation.h"
+
#include <glib/gvariant-core.h>
#include <glib/gvariant-serialiser.h>
@@ -29,8 +31,6 @@
#include <glib/gmem.h>
#include <string.h>
-#include "galias.h"
-
/*
* This file includes the structure definition for GVariant and a small
* set of functions that are allowed to access the structure directly.
@@ -927,6 +927,3 @@ g_variant_is_normal_form (GVariant *value)
return (value->state & STATE_TRUSTED) != 0;
}
-
-#define __G_VARIANT_CORE_C__
-#include "galiasdef.c"
diff --git a/glib/gvariant-internal.h b/glib/gvariant-internal.h
index 66a080a..0bdd66c 100644
--- a/glib/gvariant-internal.h
+++ b/glib/gvariant-internal.h
@@ -38,6 +38,8 @@
#include "gvariant-serialiser.h"
#include "gvarianttypeinfo.h"
+G_BEGIN_DECLS
+
gboolean g_variant_format_string_scan (const gchar *string,
const gchar *limit,
const gchar **endptr);
@@ -46,4 +48,6 @@ GVariantType * g_variant_format_string_scan_type (const g
const gchar *limit,
const gchar **endptr);
+G_END_DECLS
+
#endif /* __G_VARIANT_INTERNAL_H__ */
diff --git a/glib/gvariant-serialiser.c b/glib/gvariant-serialiser.c
index 1cf330c..8345e93 100644
--- a/glib/gvariant-serialiser.c
+++ b/glib/gvariant-serialiser.c
@@ -21,7 +21,7 @@
*/
/* Prologue {{{1 */
-#include "config.h"
+#include "glib-compilation.h"
#include "gvariant-serialiser.h"
@@ -31,8 +31,6 @@
#include <string.h>
-#include "galias.h"
-
/* GVariantSerialiser
*
* After this prologue section, this file has roughly 2 parts.
@@ -1658,7 +1656,4 @@ g_variant_serialiser_is_signature (gconstpointer data,
}
/* Epilogue {{{1 */
-#define __G_VARIANT_SERIALISER_C__
-#include "galiasdef.c"
-
/* vim:set foldmethod=marker: */
diff --git a/glib/gvariant-serialiser.h b/glib/gvariant-serialiser.h
index f26b118..23dc41c 100644
--- a/glib/gvariant-serialiser.h
+++ b/glib/gvariant-serialiser.h
@@ -32,6 +32,8 @@ typedef struct
gsize size;
} GVariantSerialised;
+G_BEGIN_DECLS
+
/* deserialisation */
gsize g_variant_serialised_n_children (GVariantSerialised container);
GVariantSerialised g_variant_serialised_get_child (GVariantSerialised container,
@@ -63,4 +65,6 @@ gboolean g_variant_serialiser_is_object_path (gconstp
gboolean g_variant_serialiser_is_signature (gconstpointer data,
gsize size);
+G_END_DECLS
+
#endif /* __G_VARIANT_SERIALISER_H__ */
diff --git a/glib/gvariant.c b/glib/gvariant.c
index 342eeeb..6e8c9bb 100644
--- a/glib/gvariant.c
+++ b/glib/gvariant.c
@@ -22,7 +22,7 @@
/* Prologue {{{1 */
-#include "config.h"
+#include "glib-compilation.h"
#include <glib/gvariant-serialiser.h>
#include "gvariant-internal.h"
@@ -34,8 +34,6 @@
#include <string.h>
-#include "galias.h"
-
/**
* SECTION: gvariant
* @title: GVariant
@@ -4120,7 +4118,4 @@ g_variant_new_from_data (const GVariantType *type,
}
/* Epilogue {{{1 */
-#define __G_VARIANT_C__
-#include "galiasdef.c"
-
/* vim:set foldmethod=marker: */
diff --git a/glib/gvarianttype.c b/glib/gvarianttype.c
index 1c1d158..e77cf34 100644
--- a/glib/gvarianttype.c
+++ b/glib/gvarianttype.c
@@ -20,7 +20,7 @@
* Author: Ryan Lortie <desrt desrt ca>
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "gvarianttype.h"
@@ -29,8 +29,6 @@
#include <string.h>
-#include "galias.h"
-
/**
* SECTION: gvarianttype
* @title: GVariantType
@@ -1489,6 +1487,3 @@ g_variant_type_checked_ (const gchar *type_string)
g_return_val_if_fail (g_variant_type_string_is_valid (type_string), NULL);
return (const GVariantType *) type_string;
}
-
-#define __G_VARIANT_TYPE_C__
-#include "galiasdef.c"
diff --git a/glib/gvarianttypeinfo.c b/glib/gvarianttypeinfo.c
index f85db7e..61bb93f 100644
--- a/glib/gvarianttypeinfo.c
+++ b/glib/gvarianttypeinfo.c
@@ -20,7 +20,7 @@
* Author: Ryan Lortie <desrt desrt ca>
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "gvarianttypeinfo.h"
@@ -28,8 +28,6 @@
#include <glib/gthread.h>
#include <glib/ghash.h>
-#include "galias.h"
-
/* < private >
* GVariantTypeInfo:
*
@@ -744,8 +742,8 @@ g_variant_type_info_get (const GVariantType *type)
g_static_rec_mutex_lock (&g_variant_type_info_lock);
if (g_variant_type_info_table == NULL)
- g_variant_type_info_table = g_hash_table_new (g_str_hash,
- g_str_equal);
+ g_variant_type_info_table = g_hash_table_new (G_INTERNAL_FUNC(g_str_hash),
+ G_INTERNAL_FUNC(g_str_equal));
info = g_hash_table_lookup (g_variant_type_info_table, type_string);
if (info == NULL)
@@ -866,6 +864,3 @@ g_variant_type_info_assert_no_infos (void)
{
g_assert (g_variant_type_info_table == NULL);
}
-
-#define __G_VARIANT_TYPE_INFO_C__
-#include "galiasdef.c"
diff --git a/glib/gvarianttypeinfo.h b/glib/gvarianttypeinfo.h
index 7c7b544..52c50a3 100644
--- a/glib/gvarianttypeinfo.h
+++ b/glib/gvarianttypeinfo.h
@@ -124,6 +124,8 @@ typedef struct
#define G_VARIANT_MEMBER_ENDING_LAST 1
#define G_VARIANT_MEMBER_ENDING_OFFSET 2
+G_BEGIN_DECLS
+
/* query */
const gchar * g_variant_type_info_get_type_string (GVariantTypeInfo *typeinfo);
@@ -148,4 +150,6 @@ GVariantTypeInfo * g_variant_type_info_ref (GVarian
void g_variant_type_info_unref (GVariantTypeInfo *typeinfo);
void g_variant_type_info_assert_no_infos (void);
+G_END_DECLS
+
#endif /* __G_VARIANT_TYPE_INFO_H__ */
diff --git a/glib/gwin32.c b/glib/gwin32.c
index 1440327..e901cd6 100644
--- a/glib/gwin32.c
+++ b/glib/gwin32.c
@@ -29,7 +29,7 @@
* MT safe for the unix part, FIXME: make the win32 part MT safe as well.
*/
-#include "config.h"
+#include "glib-compilation.h"
#include "glibconfig.h"
@@ -52,7 +52,6 @@
#endif /* _MSC_VER || __DMC__ */
#include "glib.h"
-#include "galias.h"
#ifdef G_WITH_CYGWIN
#include <sys/cygwin.h>
@@ -595,6 +594,3 @@ g_win32_locale_filename_from_utf8 (const gchar *utf8filename)
}
return retval;
}
-
-#define __G_WIN32_C__
-#include "galiasdef.c"
diff --git a/glib/pcre/pcre.h b/glib/pcre/pcre.h
index 8fc80a7..8d0de17 100644
--- a/glib/pcre/pcre.h
+++ b/glib/pcre/pcre.h
@@ -244,7 +244,6 @@ typedef struct pcre_callout_block {
} pcre_callout_block;
#include "glib.h"
-#include "galias.h"
#define pcre_malloc g_try_malloc
#define pcre_free g_free
diff --git a/glib/pltcheck.sh b/glib/pltcheck.sh
index 236eeb1..7136cce 100755
--- a/glib/pltcheck.sh
+++ b/glib/pltcheck.sh
@@ -11,15 +11,7 @@ fi
for so in .libs/lib*.so; do
echo Checking $so for local PLT entries
- # g_string_insert_c is used in g_string_append_c_inline
- # unaliased. Couldn't find a way to fix it.
- # Same for g_once_init_enter
- readelf -r $so | grep 'JU\?MP_SLOT\?' | \
- grep -v '\<g_string_insert_c\>' | \
- grep -v '\<g_atomic_[a-z]*_[sg]et\>' | \
- grep -v '\<g_once_init_enter_impl\>' | \
- grep -v '\<g_bit_' | \
- grep '\<g_' && status=1
+ readelf -r $so | grep 'JU\?MP_SLOT\?' | grep '\<g_' && status=1
done
exit $status
diff --git a/gthread/tests/1bit-mutex.c b/gthread/tests/1bit-mutex.c
index dff095c..a8a3f9c 100644
--- a/gthread/tests/1bit-mutex.c
+++ b/gthread/tests/1bit-mutex.c
@@ -27,7 +27,6 @@
/* side-step some glib build stuff */
#define DISABLE_VISIBILITY
- #define GLIB_COMPILATION
/* rebuild gbitlock.c without futex support,
defining our own version of the g_bit_*lock symbols
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
