glib/: fully remove galias hacks

82 files changed, 6 insertions, 508 deletions

diff --git a/glib/.gitignore b/glib/.gitignore
index 814afd820..e01168deb 100644
--- a/glib/.gitignore
+++ b/glib/.gitignore
@@ -1,5 +1,3 @@
-galias.h
-galiasdef.c
 gtester
 libglib-gdb.py
 makefile.msc
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 938e7bca2..52b09a2d7 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -43,21 +43,13 @@ AM_CPPFLAGS = 				\
 glib.def: glib.symbols
 	$(AM_V_GEN) (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
-	  $(AM_V_GEN) $(PERL) $(srcdir)/makegalias.pl < $(srcdir)/glib.symbols > galias.h
-
-galiasdef.c: $(srcdir)/makegalias.pl glib.symbols
-	  $(AM_V_GEN) $(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)"
-TESTS = abicheck.sh pltcheck.sh
+TESTS = abicheck.sh
 endif
 endif
 
-BUILT_SOURCES = galias.h galiasdef.c
-
 MIRRORING_TAB_SOURCE = 				\
 	glib-mirroring-tab/Makefile 		\
 	glib-mirroring-tab/gen-mirroring-tab.c	\
@@ -71,9 +63,7 @@ EXTRA_DIST += 			\
 	glib.rc.in		\
 	gen-unicode-tables.pl	\
 	gen-script-table.pl	\
-	makegalias.pl		\
 	abicheck.sh		\
-	pltcheck.sh		\
 	glib.symbols		\
 	gregex.c		\
 	gregex.h		\
@@ -84,9 +74,7 @@ EXTRA_DIST += 			\
 # These may be in the builddir too
 BUILT_EXTRA_DIST = 		\
 	makefile.msc		\
-	glib.rc			\
-	galias.h		\
-	galiasdef.c
+	glib.rc
 
 lib_LTLIBRARIES = libglib-2.0.la
 
@@ -336,7 +324,7 @@ glib_probes.h: glib_probes.d Makefile
 	sed -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
 glib_probes.o: glib_probes.d Makefile
 	$(DTRACE) -G -s $< -o $@
-BUILT_SOURCES += glib_probes.h glib_probes.o
+BUILT_SOURCES = glib_probes.h glib_probes.o
 CLEANFILES += glib_probes.h glib_probes.h.tmp
 libglib_2_0_la_LIBADD += glib_probes.o
 endif
diff --git a/glib/garray.c b/glib/garray.c
index b1e3baafc..01c6de45d 100644
--- a/glib/garray.c
+++ b/glib/garray.c
@@ -40,7 +40,6 @@
 #include "gmessages.h"
 #include "gqsort.h"
 
-#include "galias.h"
 
 /**
  * SECTION: arrays
@@ -1590,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 fcbf778fc..312bf8abf 100644
--- a/glib/gasyncqueue.c
+++ b/glib/gasyncqueue.c
@@ -33,7 +33,6 @@
 #include "gtestutils.h"
 #include "gthread.h"
 
-#include "galias.h"
 
 
 struct _GAsyncQueue
@@ -667,6 +666,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 7b33b192f..6d2ac2276 100644
--- a/glib/gatomic-gcc.c
+++ b/glib/gatomic-gcc.c
@@ -21,7 +21,6 @@
 #include "config.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 baa73e7ac..49403717c 100644
--- a/glib/gatomic.c
+++ b/glib/gatomic.c
@@ -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 238d9cf97..f5c881f50 100644
--- a/glib/gbacktrace.c
+++ b/glib/gbacktrace.c
@@ -77,7 +77,6 @@
 #  endif
 #endif
 
-#include "galias.h"
 
 #ifndef G_OS_WIN32
 static void stack_trace (char **args);
@@ -303,6 +302,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 59a911aae..bc2fa879d 100644
--- a/glib/gbase64.c
+++ b/glib/gbase64.c
@@ -31,7 +31,6 @@
 #include "glib.h"
 #include "glibintl.h"
 
-#include "galias.h"
 
 /**
  * SECTION:base64 Base64 Encoding
@@ -441,7 +440,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 915aa7cb6..1b8c41733 100644
--- a/glib/gbitlock.c
+++ b/glib/gbitlock.c
@@ -29,7 +29,6 @@
 #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 01c7e639e..a8d580da0 100644
--- a/glib/gbookmarkfile.c
+++ b/glib/gbookmarkfile.c
@@ -55,7 +55,6 @@
 #include "gtimer.h"
 #include "gutils.h"
 
-#include "galias.h"
 
 /* XBEL 1.0 standard entities */
 #define XBEL_VERSION		"1.0"
@@ -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 5830f04cf..f7e30441c 100644
--- a/glib/gbuffer.c
+++ b/glib/gbuffer.c
@@ -27,7 +27,6 @@
 #include <glib/gatomic.h>
 #include <glib/gmem.h>
 
-#include "galias.h"
 
 typedef struct
 {
diff --git a/glib/gcache.c b/glib/gcache.c
index 9c69122d5..af2615028 100644
--- a/glib/gcache.c
+++ b/glib/gcache.c
@@ -31,7 +31,6 @@
 #include "config.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 4b9ff94cd..627a18172 100644
--- a/glib/gchecksum.c
+++ b/glib/gchecksum.c
@@ -27,7 +27,6 @@
 #include "glib.h"
 #include "glibintl.h"
 
-#include "galias.h"
 
 /**
  * SECTION: checksum
@@ -1456,6 +1455,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 2a1832a31..710e6c066 100644
--- a/glib/gcompletion.c
+++ b/glib/gcompletion.c
@@ -39,7 +39,6 @@
 #undef G_DISABLE_DEPRECATED
 
 #include "gcompletion.h"
-#include "galias.h"
 
 /**
  * SECTION: completion
@@ -490,6 +489,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 520c32abe..19fd80210 100644
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -55,7 +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
@@ -2125,6 +2124,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 57f6523e7..86970c91f 100644
--- a/glib/gdataset.c
+++ b/glib/gdataset.c
@@ -37,7 +37,6 @@
 #include "glib.h"
 #include "gdatasetprivate.h"
 #include "glib_trace.h"
-#include "galias.h"
 
 /**
  * SECTION: datasets
@@ -1214,6 +1213,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 b31c0337b..723a3baf2 100644
--- a/glib/gdate.c
+++ b/glib/gdate.c
@@ -46,7 +46,6 @@
 #include <windows.h>
 #endif
 
-#include "galias.h"
 
 GDate*
 g_date_new (void)
@@ -1899,7 +1898,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 c6997ae95..7a1ad38f9 100644
--- a/glib/gdir.c
+++ b/glib/gdir.c
@@ -39,7 +39,6 @@
 
 #include "glibintl.h"
 
-#include "galias.h"
 
 #if defined (_MSC_VER) && !defined (HAVE_DIRENT_H)
 #include "../build/win32/dirent/dirent.h"
@@ -302,6 +301,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 4327f9acb..4e4c3e77a 100644
--- a/glib/gerror.c
+++ b/glib/gerror.c
@@ -27,7 +27,6 @@
 #include "config.h"
 
 #include "glib.h"
-#include "galias.h"
 
 
 /**
@@ -384,6 +383,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 76335fa47..bfd6bb68a 100644
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -52,7 +52,6 @@
 #include "gstdio.h"
 #include "glibintl.h"
 
-#include "galias.h"
 
 /**
  * g_mkdir_with_parents:
@@ -2015,6 +2014,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 417ed5d5e..e5f9aff49 100644
--- a/glib/ghash.c
+++ b/glib/ghash.c
@@ -33,7 +33,6 @@
 #include <string.h>  /* memset */
 
 #include "glib.h"
-#include "galias.h"
 
 /**
  * SECTION: hash_tables
@@ -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 d038ee2c2..39f36bb72 100644
--- a/glib/ghook.c
+++ b/glib/ghook.c
@@ -34,7 +34,6 @@
 #include "config.h"
 
 #include "glib.h"
-#include "galias.h"
 
 
 /* --- functions --- */
@@ -633,6 +632,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 387145687..f6237b059 100644
--- a/glib/ghostutils.c
+++ b/glib/ghostutils.c
@@ -26,7 +26,6 @@
 
 #include <string.h>
 
-#include "galias.h"
 
 /**
  * SECTION:ghostutils
@@ -764,6 +763,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 68acd6063..3d7df4772 100644
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -48,7 +48,6 @@
 
 #include "glibintl.h"
 
-#include "galias.h"
 
 /**
  * SECTION: iochannels
@@ -2579,6 +2578,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 0e89d5c15..7307a76fe 100644
--- a/glib/giounix.c
+++ b/glib/giounix.c
@@ -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 ae2dcde80..cabe2c94f 100644
--- a/glib/giowin32.c
+++ b/glib/giowin32.c
@@ -84,7 +84,6 @@
 #include "gstdio.h"
 #include "glibintl.h"
 
-#include "galias.h"
 
 typedef struct _GIOWin32Channel GIOWin32Channel;
 typedef struct _GIOWin32Watch GIOWin32Watch;
@@ -2239,6 +2238,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 2f4b02236..10ca2a2af 100644
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -65,7 +65,6 @@
 #include "gstrfuncs.h"
 #include "gutils.h"
 
-#include "galias.h"
 
 typedef struct _GKeyFileGroup GKeyFileGroup;
 
@@ -3929,6 +3928,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/glib.py b/glib/glib.py
index 0953aee7c..135f4bc33 100644
--- a/glib/glib.py
+++ b/glib/glib.py
@@ -115,10 +115,7 @@ class GHashPrinter:
         try:
             string_hash = read_global_var ("g_str_hash")
         except:
-            try:
-                string_hash = read_global_var ("IA__g_str_hash")
-            except:
-                string_hash = None
+            string_hash = None
         if self.val != 0 and string_hash != None and self.val["hash_func"] == string_hash:
             self.keys_are_strings = True
 
diff --git a/glib/glib.symbols b/glib/glib.symbols
index 648812a25..e3421f131 100644
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -1,7 +1,5 @@
 /* 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).
+ * the glib.def file used to control exports on Windows.
  * 
  * Every symbol must be included in the right
  * #ifdef IN_HEADER(sym) #endif and
diff --git a/glib/glist.c b/glib/glist.c
index 252330a8a..95ba0003f 100644
--- a/glib/glist.c
+++ b/glib/glist.c
@@ -31,7 +31,6 @@
 #include "config.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/gmain.c b/glib/gmain.c
index 32b1d2199..ce703cbd7 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -77,7 +77,6 @@
 #include <sys/wait.h>
 #endif
 
-#include "galias.h"
 
 /* Types */
 
@@ -4251,6 +4250,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 42f132242..2af6630a3 100644
--- a/glib/gmappedfile.c
+++ b/glib/gmappedfile.c
@@ -56,7 +56,6 @@
 
 #include "glibintl.h"
 
-#include "galias.h"
 
 #ifndef _O_BINARY
 #define _O_BINARY 0
@@ -343,6 +342,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 53edae550..417d25678 100644
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -29,7 +29,6 @@
 
 #include "glib.h"
 #include "glibintl.h"
-#include "galias.h"
 
 GQuark
 g_markup_error_quark (void)
@@ -2779,6 +2778,3 @@ failure:
 
   return FALSE;
 }
-
-#define __G_MARKUP_C__
-#include "galiasdef.c"
diff --git a/glib/gmem.c b/glib/gmem.c
index f62e604c5..a9c3710d5 100644
--- a/glib/gmem.c
+++ b/glib/gmem.c
@@ -41,7 +41,6 @@
 #include "gthread.h"
 #include "glib_trace.h"
 
-#include "galias.h"
 
 #define MEM_PROFILE_TABLE_SIZE 4096
 
@@ -1197,6 +1196,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 9a3eec37d..235e726bd 100644
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -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() */
@@ -575,12 +574,6 @@ g_return_if_fail_warning (const char *log_domain,
 			  const char *pretty_function,
 			  const char *expression)
 {
-  /*
-   * Omit the prefix used by the PLT-reduction
-   * technique used in GTK+. 
-   */
-  if (g_str_has_prefix (pretty_function, "IA__"))
-    pretty_function += 4;
   g_log (log_domain,
 	 G_LOG_LEVEL_CRITICAL,
 	 "%s: assertion `%s' failed",
@@ -616,12 +609,6 @@ g_assert_warning (const char *log_domain,
 		  const char *pretty_function,
 		  const char *expression)
 {
-  /*
-   * Omit the prefix used by the PLT-reduction
-   * technique used in GTK+. 
-   */
-  if (g_str_has_prefix (pretty_function, "IA__"))
-    pretty_function += 4;
   g_log (log_domain,
 	 G_LOG_LEVEL_ERROR,
 	 expression 
@@ -1161,6 +1148,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 7d3dfceb6..70537759b 100644
--- a/glib/gnode.c
+++ b/glib/gnode.c
@@ -34,7 +34,6 @@
 #include "config.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/gnulib/g-gnulib.h b/glib/gnulib/g-gnulib.h
index 6dbf2e91a..88f3e0eb1 100644
--- a/glib/gnulib/g-gnulib.h
+++ b/glib/gnulib/g-gnulib.h
@@ -21,7 +21,6 @@
 #include "config.h"
 #include <stdlib.h>
 #include "glib/glib.h"
-#include "glib/galias.h"
 
 /* Private namespace for gnulib functions */
 #define asnprintf        _g_gnulib_asnprintf
diff --git a/glib/goption.c b/glib/goption.c
index 9747d4771..ff762e831 100644
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -132,7 +132,6 @@
 #include "glibintl.h"
 #include "gprintf.h"
 
-#include "galias.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -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 33e4aac2c..1c37e98e6 100644
--- a/glib/gpattern.c
+++ b/glib/gpattern.c
@@ -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 30e5429d0..651392c09 100644
--- a/glib/gpoll.c
+++ b/glib/gpoll.c
@@ -77,7 +77,6 @@
 #include <windows.h>
 #endif /* G_OS_WIN32 */
 
-#include "galias.h"
 
 #ifdef G_MAIN_POLL_DEBUG
 extern gboolean _g_main_poll_debug;
@@ -425,6 +424,3 @@ g_poll (GPollFD *fds,
 #endif /* !G_OS_WIN32 */
 
 #endif	/* !HAVE_POLL */
-
-#define __G_POLL_C__
-#include "galiasdef.c"
diff --git a/glib/gprimes.c b/glib/gprimes.c
index 7beca710c..439c1c89e 100644
--- a/glib/gprimes.c
+++ b/glib/gprimes.c
@@ -31,7 +31,6 @@
 #include "config.h"
 
 #include "glib.h"
-#include "galias.h"
 
 
 static const guint g_primes[] =
@@ -85,6 +84,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 35288617d..7618c2d45 100644
--- a/glib/gprintf.c
+++ b/glib/gprintf.c
@@ -31,7 +31,6 @@
 #include "gprintf.h"
 #include "gprintfint.h"
 
-#include "galias.h"
 
 /**
  * g_printf:
@@ -339,6 +338,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 176d44a93..941a0446a 100644
--- a/glib/gqsort.c
+++ b/glib/gqsort.c
@@ -39,7 +39,6 @@
 #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 1368e2614..010087003 100644
--- a/glib/gqueue.c
+++ b/glib/gqueue.c
@@ -27,7 +27,6 @@
 #include "config.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 231ed13db..33bbbbcac 100644
--- a/glib/grand.c
+++ b/glib/grand.c
@@ -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 4a305b80a..ba59607c4 100644
--- a/glib/gregex.c
+++ b/glib/gregex.c
@@ -38,7 +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		| \
@@ -2789,6 +2788,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 76092748b..59d5bbbfc 100644
--- a/glib/grel.c
+++ b/glib/grel.c
@@ -40,7 +40,6 @@
 #undef G_DISABLE_DEPRECATED
 
 #include "grel.h"
-#include "galias.h"
 
 /**
  * SECTION: relations
@@ -674,6 +673,3 @@ g_relation_print (GRelation *relation)
     }
   
 }
-
-#define __G_REL_C__
-#include "galiasdef.c"
diff --git a/glib/gscanner.c b/glib/gscanner.c
index 233cc73b9..c4788e7b5 100644
--- a/glib/gscanner.c
+++ b/glib/gscanner.c
@@ -44,7 +44,6 @@
 
 #include	"glib.h"
 #include	"gprintfint.h"
-#include        "galias.h"
 
 #ifdef G_OS_WIN32
 #include	<io.h>		/* For _read() */
@@ -1762,6 +1761,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 ee00708ba..c95c66e14 100644
--- a/glib/gsequence.c
+++ b/glib/gsequence.c
@@ -21,7 +21,6 @@
 #include "config.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 44f9ec354..39ebdb666 100644
--- a/glib/gshell.c
+++ b/glib/gshell.c
@@ -31,7 +31,6 @@
 #endif
 
 #include "glibintl.h"
-#include "galias.h"
 
 /**
  * SECTION: shell
@@ -690,6 +689,3 @@ g_shell_parse_argv (const gchar *command_line,
   
   return FALSE;
 }
-
-#define __G_SHELL_C__
-#include "galiasdef.c"
diff --git a/glib/gslice.c b/glib/gslice.c
index 41bd93cda..7b6a9b796 100644
--- a/glib/gslice.c
+++ b/glib/gslice.c
@@ -36,7 +36,6 @@
 #include "gthreadprivate.h"
 #include "glib.h"
 #include "glib_trace.h"
-#include "galias.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>             /* sysconf() */
 #endif
@@ -1488,6 +1487,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 5dcbc7fb5..47af13a61 100644
--- a/glib/gslist.c
+++ b/glib/gslist.c
@@ -31,7 +31,6 @@
 #include "config.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.c b/glib/gspawn-win32.c
index dc48a25c3..44ae907ff 100644
--- a/glib/gspawn-win32.c
+++ b/glib/gspawn-win32.c
@@ -47,7 +47,6 @@
 #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 1425450b7..c2b814efa 100644
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -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 82549f58d..54c21646a 100644
--- a/glib/gstdio.c
+++ b/glib/gstdio.c
@@ -45,7 +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
@@ -824,6 +823,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 db6a5fdc3..be44eb72a 100644
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -48,7 +48,6 @@
 #include "gprintfint.h"
 #include "glibintl.h"
 
-#include "galias.h"
 
 #ifdef G_OS_WIN32
 #include <windows.h>
@@ -3270,7 +3269,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 eeb84b773..134edd56b 100644
--- a/glib/gstring.c
+++ b/glib/gstring.c
@@ -42,7 +42,6 @@
 #include "glib.h"
 #include "gprintf.h"
 
-#include "galias.h"
 
 /**
  * SECTION: string_chunks
@@ -1519,6 +1518,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 31a4a5d20..80fc3eaae 100644
--- a/glib/gtestutils.c
+++ b/glib/gtestutils.c
@@ -49,7 +49,6 @@
 #include "gstrfuncs.h"
 #include "gtimer.h"
 
-#include "galias.h"
  
 /* Global variable for storing assertion messages; this is the counterpart to
  * glibc's (private) __abort_msg variable, and allows developers and crash
@@ -2038,6 +2037,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 33d436360..5d50d884b 100644
--- a/glib/gthread.c
+++ b/glib/gthread.c
@@ -61,7 +61,6 @@
 #include "gtestutils.h"
 #include "gtimer.h"
 
-#include "galias.h"
 
 /**
  * SECTION: threads
@@ -2537,7 +2536,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 3ece1b445..ea312da7e 100644
--- a/glib/gthreadpool.c
+++ b/glib/gthreadpool.c
@@ -27,7 +27,6 @@
 #include "config.h"
 
 #include "glib.h"
-#include "galias.h"
 
 /**
  * SECTION: thread_pools
@@ -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 91f3f8aca..c1169a795 100644
--- a/glib/gtimer.c
+++ b/glib/gtimer.c
@@ -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 17bfb824f..d7b993fb2 100644
--- a/glib/gtree.c
+++ b/glib/gtree.c
@@ -31,7 +31,6 @@
 #include "config.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 9c129218c..2087d1ed2 100644
--- a/glib/gunibreak.c
+++ b/glib/gunibreak.c
@@ -24,7 +24,6 @@
 
 #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 2bf579eca..b64b0a4a8 100644
--- a/glib/gunicollate.c
+++ b/glib/gunicollate.c
@@ -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 d0fa97e24..607ceb662 100644
--- a/glib/gunidecomp.c
+++ b/glib/gunidecomp.c
@@ -27,7 +27,6 @@
 #include "gunidecomp.h"
 #include "gunicomp.h"
 #include "gunicodeprivate.h"
-#include "galias.h"
 
 
 #define CC_PART1(Page, Char) \
@@ -530,6 +529,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 8a28513ed..39be7dd2f 100644
--- a/glib/guniprop.c
+++ b/glib/guniprop.c
@@ -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 a2930aa54..6a77244c6 100644
--- a/glib/gurifuncs.c
+++ b/glib/gurifuncs.c
@@ -32,7 +32,6 @@
 #include <string.h>
 
 #include "config.h"
-#include "galias.h"
 
 /**
  * SECTION:gurifuncs
@@ -248,6 +247,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 d0badbbe0..3d1d1800b 100644
--- a/glib/gutf8.c
+++ b/glib/gutf8.c
@@ -39,7 +39,6 @@
 #include "libcharset/libcharset.h"
 
 #include "glibintl.h"
-#include "galias.h"
 
 #define UTF8_COMPUTE(Char, Mask, Len)					      \
   if (Char < 128)							      \
@@ -1897,7 +1896,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 406665e03..406b4b1b5 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -61,7 +61,6 @@
 #include "gprintfint.h"
 #include "gthreadprivate.h"
 #include "glibintl.h"
-#include "galias.h"
 
 #ifdef	MAXPATHLEN
 #define	G_PATH_LENGTH	MAXPATHLEN
@@ -3596,6 +3595,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 2b8caa504..35f7e9a53 100644
--- a/glib/gvariant-core.c
+++ b/glib/gvariant-core.c
@@ -29,7 +29,6 @@
 #include <glib/gmem.h>
 #include <string.h>
 
-#include "galias.h"
 
 /*
  * This file includes the structure definition for GVariant and a small
@@ -951,6 +950,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-parser.c b/glib/gvariant-parser.c
index 7932d855f..1689d3eea 100644
--- a/glib/gvariant-parser.c
+++ b/glib/gvariant-parser.c
@@ -24,7 +24,6 @@
 #include <errno.h>
 #include <glib.h>
 
-#include "galias.h"
 
 /*
  * two-pass algorithm
@@ -2450,7 +2449,3 @@ g_variant_builder_add_parsed (GVariantBuilder *builder,
   g_variant_builder_add_value (builder, g_variant_new_parsed_va (format, &ap));
   va_end (ap);
 }
-
-
-#define __G_VARIANT_PARSER_C__
-#include "galiasdef.c"
diff --git a/glib/gvariant-serialiser.c b/glib/gvariant-serialiser.c
index ee2ec8c57..d6d626e88 100644
--- a/glib/gvariant-serialiser.c
+++ b/glib/gvariant-serialiser.c
@@ -31,7 +31,6 @@
 
 #include <string.h>
 
-#include "galias.h"
 
 /* GVariantSerialiser
  *
@@ -1682,7 +1681,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.c b/glib/gvariant.c
index 28caee9cc..2092b78b5 100644
--- a/glib/gvariant.c
+++ b/glib/gvariant.c
@@ -34,7 +34,6 @@
 
 #include <string.h>
 
-#include "galias.h"
 
 /**
  * SECTION: gvariant
@@ -4630,7 +4629,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 1c1d15861..b33d60eef 100644
--- a/glib/gvarianttype.c
+++ b/glib/gvarianttype.c
@@ -29,7 +29,6 @@
 
 #include <string.h>
 
-#include "galias.h"
 
 /**
  * SECTION: gvarianttype
@@ -1489,6 +1488,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 52f7b7d76..c5998d39e 100644
--- a/glib/gvarianttypeinfo.c
+++ b/glib/gvarianttypeinfo.c
@@ -28,7 +28,6 @@
 #include <glib/gthread.h>
 #include <glib/ghash.h>
 
-#include "galias.h"
 
 /* < private >
  * GVariantTypeInfo:
@@ -868,6 +867,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/gwin32.c b/glib/gwin32.c
index 144032766..9ba02ad75 100644
--- a/glib/gwin32.c
+++ b/glib/gwin32.c
@@ -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/makefile.msc.in b/glib/makefile.msc.in
index e13673a62..936d6568e 100644
--- a/glib/makefile.msc.in
+++ b/glib/makefile.msc.in
@@ -18,8 +18,6 @@ DEPCFLAGS = -Zm400 $(INTL_CFLAGS) $(DIRENT_CFLAGS)
 all :				\
 	..\config.h		\
 	..\glibconfig.h	\
-	galias.h		\
-	galiasdef.c		\
 	gnulib\gnulib.lib	\
 	pcre\pcre.lib		\
 	libglib-2.0-0.dll \
@@ -107,12 +105,6 @@ glib_OBJECTS =			\
 ..\config.h: ..\config.h.win32
 	copy ..\config.h.win32 ..\config.h
 
-galias.h: glib.symbols
-	perl makegalias.pl < glib.symbols > galias.h
-
-galiasdef.c: glib.symbols
-	  perl makegalias.pl -def < glib.symbols > galiasdef.c
-
 localcharset.obj : libcharset\localcharset.c
 	$(CC) $(CFLAGS) -DLIBDIR=\".\" -c libcharset\localcharset.c
 
diff --git a/glib/makegalias.pl b/glib/makegalias.pl
deleted file mode 100755
index 2a5e065ac..000000000
--- a/glib/makegalias.pl
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/usr/bin/perl -w
-
-exit 0;
-
-my $do_def = 0;
-
-if (($#ARGV >= 0) && ($ARGV[0] eq "-def")) {
-    shift;
-    $do_def = 1;
-}
-
-print <<EOF;
-/* Generated by makegalias.pl */
-
-#ifndef DISABLE_VISIBILITY
-
-#include "glibconfig.h"
-
-#ifdef G_HAVE_GNUC_VISIBILITY
-
-EOF
-
-if ($do_def) {
-    print <<EOF
-#undef IN_FILE
-#define IN_FILE defined
-
-#undef IN_HEADER
-#define IN_HEADER(x) 1
-
-EOF
-} 
-else { 
-    print <<EOF
-#define IN_FILE(x) 1
-#define IN_HEADER defined
-
-EOF
-}
-
-my $in_comment = 0;
-my $in_skipped_section = 0;
-
-while (<>) {
-
-  # ignore empty lines
-  next if /^\s*$/;
-
-  # skip comments
-  if ($_ =~ /^\s*\/\*/)
-  {
-      $in_comment = 1;
-  }
-  
-  if ($in_comment)
-  {
-      if ($_ =~  /\*\/\s$/)
-      {
-	  $in_comment = 0;
-      }
-      
-      next;
-  }
-
-  # handle ifdefs
-  if ($_ =~ /^\#endif/)
-  {
-      if (!$in_skipped_section)
-      {
-	  print $_;
-      }
-
-      $in_skipped_section = 0;
-
-      next;
-  }
-
-  if ($_ =~ /^\#ifdef\s+(INCLUDE_VARIABLES|INCLUDE_INTERNAL_SYMBOLS|ALL_FILES)/)
-  {
-      $in_skipped_section = 1;
-  }
-
-  if ($in_skipped_section)
-  {
-      next;
-  }
-
-  if ($_ =~ /^\#ifn?def\s+(G|DISABLE_MEM_POOLS|_WIN64)/)
-  {
-      print $_;
-      
-      next;
-  }
-
-  if ($_ =~ /^\#if.*(G_STDIO_NO_WRAP_ON_UNIX|IN_FILE|IN_HEADER|IN_FILE)/)
-  {
-      print $_;
-      
-      next;
-  }
-
-  chop;
-  my $str = $_;
-  my @words;
-  my $attributes = "";
-
-  @words = split(/ /, $str);
-  $str = shift(@words);
-  chomp($str);
-  my $alias = "IA__".$str;
-  
-  # Drop any Win32 specific .def file syntax,  but keep attributes
-  foreach $word (@words) {
-      $attributes = "$attributes $word" unless $word eq "PRIVATE";
-  }
-
-  if (!$do_def) {
-    print <<EOF
-extern __typeof ($str) $alias __attribute((visibility("hidden")))$attributes;
-\#define $str $alias
-
-EOF
-  }
-  else {
-    print <<EOF
-\#undef $str 
-extern __typeof ($str) $str __attribute((alias("$alias"), visibility("default")));
-
-EOF
-  }
-}
-
-print <<EOF
-
-#endif /* G_HAVE_GNUC_VISIBILITY */
-#endif /* DISABLE_VISIBILITY */
-EOF
-
diff --git a/glib/pcre/pcre.h b/glib/pcre/pcre.h
index 302ced76b..4864bd099 100644
--- a/glib/pcre/pcre.h
+++ b/glib/pcre/pcre.h
@@ -251,7 +251,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
deleted file mode 100755
index 5f735a988..000000000
--- a/glib/pltcheck.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-exit 0
-
-LANG=C
-
-status=0
-
-if ! which readelf 2>/dev/null >/dev/null; then
-	echo "'readelf' not found; skipping test"
-	exit 0
-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
-done
-
-exit $status
diff --git a/glib/update-pcre/memory.patch b/glib/update-pcre/memory.patch
index 65b7b9790..e74a3999f 100644
--- a/glib/update-pcre/memory.patch
+++ b/glib/update-pcre/memory.patch
@@ -1,7 +1,7 @@
 diff -r 0f4042339eb5 pcre/pcre.h
 --- pcre/pcre.h	Tue Jul 25 22:39:16 2006 +0200
 +++ pcre/pcre.h	Tue Jul 25 22:52:10 2006 +0200
-@@ -233,25 +233,14 @@ typedef struct pcre_callout_block {
+@@ -233,25 +233,13 @@ typedef struct pcre_callout_block {
    /* ------------------------------------------------------------------ */
  } pcre_callout_block;
  
@@ -17,7 +17,6 @@ diff -r 0f4042339eb5 pcre/pcre.h
 -PCRE_DATA_SCOPE void *(*pcre_stack_malloc)(size_t);
 -PCRE_DATA_SCOPE void  (*pcre_stack_free)(void *);
 +#include "glib.h"
-+#include "galias.h"
 +
 +#define pcre_malloc g_try_malloc
 +#define pcre_free g_free
diff --git a/glib/win_iconv.c b/glib/win_iconv.c
index ea1924024..416568aa0 100644
--- a/glib/win_iconv.c
+++ b/glib/win_iconv.c
@@ -1953,4 +1953,3 @@ main(int argc, char **argv)
     return 0;

 }

 #endif

-