diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2010-07-07 19:53:22 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2010-07-07 19:53:22 -0400 |
| commit | 5b946e0504952a472cea1ef95df0967e8a4a7b47 (patch) | |
| tree | 59eb76201f1083274b0215cc141803f31c41ad3c | |
| parent | 0fc50fa5f7424d21ff43a79838fe76ff73ad869b (diff) | |
gio/: fully remove gioalias hacks
153 files changed, 3 insertions, 709 deletions
diff --git a/gio/.gitignore b/gio/.gitignore index d7fe8804d..f4296d9f5 100644 --- a/gio/.gitignore +++ b/gio/.gitignore @@ -2,8 +2,6 @@ gschema-compile gio-querymodules gio-marshal.[ch] gioenumtypes.[ch] -gioalias.h -gioaliasdef.c glib-compile-schemas gdbus gsettings diff --git a/gio/Makefile.am b/gio/Makefile.am index f350a0cbe..dd6bb9e8b 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -27,17 +27,9 @@ gio.def: gio.symbols $(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gio.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g' | sort) > gio.def.tmp && \ mv gio.def.tmp gio.def -gioalias.h: gio.symbols makegioalias.pl - $(AM_V_GEN) $(PERL) $(srcdir)/makegioalias.pl < $(srcdir)/gio.symbols > gioalias.h.tmp && \ - mv gioalias.h.tmp gioalias.h - -gioaliasdef.c: gio.symbols makegioalias.pl - $(AM_V_GEN) $(PERL) $(srcdir)/makegioalias.pl -def < $(srcdir)/gio.symbols > gioaliasdef.c.tmp && \ - mv gioaliasdef.c.tmp gioaliasdef.c - if OS_LINUX if HAVE_GNUC_VISIBILITY -TESTS = abicheck.sh pltcheck.sh +TESTS = abicheck.sh endif endif @@ -364,8 +356,6 @@ libgio_2_0_la_SOURCES = \ gmountprivate.h \ gioenumtypes.h \ gioenumtypes.c \ - gioalias.h \ - gioaliasdef.c \ $(appinfo_sources) \ $(unix_sources) \ $(win32_sources) \ @@ -515,8 +505,6 @@ gioinclude_HEADERS = \ BUILT_SOURCES = \ gio-marshal.h \ gio-marshal.c \ - gioalias.h \ - gioaliasdef.c \ gioenumtypes.h \ gioenumtypes.c \ $(NULL) @@ -527,9 +515,7 @@ EXTRA_DIST += \ gioenumtypes.h.template \ gioenumtypes.c.template \ makefile.msc \ - makegioalias.pl \ abicheck.sh \ - pltcheck.sh \ gio.rc.in \ gschema.dtd \ $(NULL) diff --git a/gio/fen/fen-dump.c b/gio/fen/fen-dump.c index 98d20ebbe..7a34fa49c 100644 --- a/gio/fen/fen-dump.c +++ b/gio/fen/fen-dump.c @@ -74,4 +74,3 @@ dump_event (node_event_t* ev, gpointer user_data) node_t* node = ev->user_data; g_printf ("ne:0x%p e:%p n:0x%p ds:0x%p s:0x%p s\n", ev, ev->e, node, node->dir_subs, node->subs, NODE_NAME(node)); } - diff --git a/gio/fen/fen-helper.c b/gio/fen/fen-helper.c index e68e7c32c..f742d42dc 100644 --- a/gio/fen/fen-helper.c +++ b/gio/fen/fen-helper.c @@ -194,4 +194,3 @@ fen_init () G_UNLOCK (fen_lock); return result; } - diff --git a/gio/fen/fen-kernel.c b/gio/fen/fen-kernel.c index 8b9c58b0d..2649e957f 100644 --- a/gio/fen/fen-kernel.c +++ b/gio/fen/fen-kernel.c @@ -554,4 +554,3 @@ _event_string (int event) return "EVENT_UNKNOWN"; } } - diff --git a/gio/fen/fen-node.c b/gio/fen/fen-node.c index d4d7ddbd2..c151e93e3 100644 --- a/gio/fen/fen-node.c +++ b/gio/fen/fen-node.c @@ -639,4 +639,3 @@ node_event_delete (node_event_t* ev) { g_free (ev); } - diff --git a/gio/fen/gfendirectorymonitor.c b/gio/fen/gfendirectorymonitor.c index 3b53a3aaa..c8a1e1294 100644 --- a/gio/fen/gfendirectorymonitor.c +++ b/gio/fen/gfendirectorymonitor.c @@ -35,8 +35,6 @@ #include "fen-helper.h" -#include "gioalias.h" - struct _GFenDirectoryMonitor { GLocalDirectoryMonitor parent_instance; @@ -142,4 +140,3 @@ g_fen_directory_monitor_cancel (GFileMonitor* monitor) return TRUE; } - diff --git a/gio/fen/gfenfilemonitor.c b/gio/fen/gfenfilemonitor.c index de011f0cd..72394cf2b 100644 --- a/gio/fen/gfenfilemonitor.c +++ b/gio/fen/gfenfilemonitor.c @@ -35,8 +35,6 @@ #include "fen-helper.h" -#include "gioalias.h" - struct _GFenFileMonitor { GLocalFileMonitor parent_instance; @@ -142,4 +140,3 @@ g_fen_file_monitor_cancel (GFileMonitor* monitor) return TRUE; } - diff --git a/gio/gappinfo.c b/gio/gappinfo.c index 9380f533d..93dcbb712 100644 --- a/gio/gappinfo.c +++ b/gio/gappinfo.c @@ -26,7 +26,6 @@ #include <gioerror.h> #include <gfile.h> -#include "gioalias.h" /** * SECTION:gappinfo @@ -818,7 +817,3 @@ g_app_launch_context_launch_failed (GAppLaunchContext *context, if (class->launch_failed != NULL) class->launch_failed (context, startup_notify_id); } - - -#define __G_APP_INFO_C__ -#include "gioaliasdef.c" diff --git a/gio/gapplication.c b/gio/gapplication.c index 2e3a3e5da..16318d39d 100644 --- a/gio/gapplication.c +++ b/gio/gapplication.c @@ -39,7 +39,6 @@ #include "gdbusintrospection.h" #include "gdbusmethodinvocation.h" -#include "gioalias.h" /** * SECTION: gapplication @@ -1323,6 +1322,3 @@ g_application_class_init (GApplicationClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); } - -#define __G_APPLICATION_C__ -#include "gioaliasdef.c" diff --git a/gio/gasynchelper.c b/gio/gasynchelper.c index b7755c691..b43970370 100644 --- a/gio/gasynchelper.c +++ b/gio/gasynchelper.c @@ -24,7 +24,6 @@ #include "gasynchelper.h" -#include "gioalias.h" /** * SECTION:gasynchelper diff --git a/gio/gasyncinitable.c b/gio/gasyncinitable.c index ba24abc4f..aa13fe578 100644 --- a/gio/gasyncinitable.c +++ b/gio/gasyncinitable.c @@ -26,7 +26,6 @@ #include "gsimpleasyncresult.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gasyncinitable @@ -359,6 +358,3 @@ g_async_initable_new_finish (GAsyncInitable *initable, else return NULL; } - -#define __G_ASYNC_INITABLE_C__ -#include "gioaliasdef.c" diff --git a/gio/gasyncresult.c b/gio/gasyncresult.c index 5af279201..9b2be2e92 100644 --- a/gio/gasyncresult.c +++ b/gio/gasyncresult.c @@ -24,7 +24,6 @@ #include "gasyncresult.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gasyncresult @@ -157,6 +156,3 @@ g_async_result_get_source_object (GAsyncResult *res) return (* iface->get_source_object) (res); } - -#define __G_ASYNC_RESULT_C__ -#include "gioaliasdef.c" diff --git a/gio/gbufferedinputstream.c b/gio/gbufferedinputstream.c index 4883a0514..f0f912494 100644 --- a/gio/gbufferedinputstream.c +++ b/gio/gbufferedinputstream.c @@ -31,7 +31,6 @@ #include <string.h> #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gbufferedinputstream @@ -1380,7 +1379,3 @@ g_buffered_input_stream_skip_finish (GInputStream *stream, return data->bytes_skipped; } - - -#define __G_BUFFERED_INPUT_STREAM_C__ -#include "gioaliasdef.c" diff --git a/gio/gbufferedoutputstream.c b/gio/gbufferedoutputstream.c index ec84a6172..4d488caaf 100644 --- a/gio/gbufferedoutputstream.c +++ b/gio/gbufferedoutputstream.c @@ -27,8 +27,6 @@ #include "string.h" #include "glibintl.h" -#include <gioalias.h> - /** * SECTION:gbufferedoutputstream * @short_description: Buffered Output Stream @@ -763,6 +761,3 @@ g_buffered_output_stream_close_finish (GOutputStream *stream, return TRUE; } - -#define __G_BUFFERED_OUTPUT_STREAM_C__ -#include "gioaliasdef.c" diff --git a/gio/gcancellable.c b/gio/gcancellable.c index ea12b0a78..e757b8f48 100644 --- a/gio/gcancellable.c +++ b/gio/gcancellable.c @@ -34,7 +34,6 @@ #include "gcancellable.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gcancellable @@ -771,6 +770,3 @@ g_cancellable_disconnect (GCancellable *cancellable, g_signal_handler_disconnect (cancellable, handler_id); G_UNLOCK (cancellable); } - -#define __G_CANCELLABLE_C__ -#include "gioaliasdef.c" diff --git a/gio/gcharsetconverter.c b/gio/gcharsetconverter.c index fe8fe69c9..ea604374d 100644 --- a/gio/gcharsetconverter.c +++ b/gio/gcharsetconverter.c @@ -31,7 +31,6 @@ #include "gioerror.h" #include "glibintl.h" -#include "gioalias.h" enum { PROP_0, @@ -473,6 +472,3 @@ g_charset_converter_initable_iface_init (GInitableIface *iface) { iface->init = g_charset_converter_initable_init; } - -#define __G_CHARSET_CONVERTER_C__ -#include "gioaliasdef.c" diff --git a/gio/gcontenttype.c b/gio/gcontenttype.c index d7629100b..cc74cbfa0 100644 --- a/gio/gcontenttype.c +++ b/gio/gcontenttype.c @@ -35,7 +35,6 @@ #include "gfileinfo.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gcontenttype @@ -1682,6 +1681,3 @@ g_content_type_guess_for_tree (GFile *root) } #endif /* Unix version */ - -#define __G_CONTENT_TYPE_C__ -#include "gioaliasdef.c" diff --git a/gio/gconverter.c b/gio/gconverter.c index 930bd036a..74e90c211 100644 --- a/gio/gconverter.c +++ b/gio/gconverter.c @@ -24,7 +24,6 @@ #include "gconverter.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gconverter @@ -200,6 +199,3 @@ g_converter_reset (GConverter *converter) (* iface->reset) (converter); } - -#define __G_CONVERTER_C__ -#include "gioaliasdef.c" diff --git a/gio/gconverterinputstream.c b/gio/gconverterinputstream.c index d571f07d1..16b640bec 100644 --- a/gio/gconverterinputstream.c +++ b/gio/gconverterinputstream.c @@ -31,7 +31,6 @@ #include "gioerror.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gconverterinputstream @@ -552,6 +551,3 @@ g_converter_input_stream_get_converter (GConverterInputStream *converter_stream) { return converter_stream->priv->converter; } - -#define __G_CONVERTER_INPUT_STREAM_C__ -#include "gioaliasdef.c" diff --git a/gio/gconverteroutputstream.c b/gio/gconverteroutputstream.c index 4e1951b5e..f4f8661c6 100644 --- a/gio/gconverteroutputstream.c +++ b/gio/gconverteroutputstream.c @@ -31,7 +31,6 @@ #include "gioerror.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gconverteroutputstream @@ -611,6 +610,3 @@ g_converter_output_stream_get_converter (GConverterOutputStream *converter_strea { return converter_stream->priv->converter; } - -#define __G_CONVERTER_OUTPUT_STREAM_C__ -#include "gioaliasdef.c" diff --git a/gio/gcredentials.c b/gio/gcredentials.c index 40d6757ee..5b8119d2b 100644 --- a/gio/gcredentials.c +++ b/gio/gcredentials.c @@ -38,7 +38,6 @@ #include "gioerror.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gcredentials @@ -343,6 +342,3 @@ g_credentials_set_unix_user (GCredentials *credentials, return ret; } #endif /* G_OS_UNIX */ - -#define __G_CREDENTIALS_C__ -#include "gioaliasdef.c" diff --git a/gio/gdatainputstream.c b/gio/gdatainputstream.c index 81827ffb1..ad8bf5e4b 100644 --- a/gio/gdatainputstream.c +++ b/gio/gdatainputstream.c @@ -30,7 +30,6 @@ #include "gioerror.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gdatainputstream @@ -1246,7 +1245,3 @@ g_data_input_stream_read_until_finish (GDataInputStream *stream, return g_data_input_stream_read_finish (stream, result, length, error); } - - -#define __G_DATA_INPUT_STREAM_C__ -#include "gioaliasdef.c" diff --git a/gio/gdataoutputstream.c b/gio/gdataoutputstream.c index 1dc2dd8d7..b700523b6 100644 --- a/gio/gdataoutputstream.c +++ b/gio/gdataoutputstream.c @@ -26,7 +26,6 @@ #include "gioenumtypes.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gdataoutputstream @@ -500,7 +499,4 @@ g_data_output_stream_put_string (GDataOutputStream *stream, str, strlen (str), &bytes_written, cancellable, error); -} - -#define __G_DATA_OUTPUT_STREAM_C__ -#include "gioaliasdef.c" +} diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c index 6d56bfb5f..4b815e672 100644 --- a/gio/gdbusaddress.c +++ b/gio/gdbusaddress.c @@ -43,7 +43,6 @@ #endif #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gdbusaddress @@ -1264,6 +1263,3 @@ g_dbus_address_get_for_bus_sync (GBusType bus_type, return ret; } - -#define __G_DBUS_ADDRESS_C__ -#include "gioaliasdef.c" diff --git a/gio/gdbusapplication.c b/gio/gdbusapplication.c index e376c04bb..b88d0e063 100644 --- a/gio/gdbusapplication.c +++ b/gio/gdbusapplication.c @@ -417,4 +417,3 @@ _g_application_platform_remote_quit (GApplication *app, if (result) g_variant_unref (result); } - diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c index b0af4fa6b..7f19ace87 100644 --- a/gio/gdbusauth.c +++ b/gio/gdbusauth.c @@ -46,7 +46,6 @@ #endif #include "glibintl.h" -#include "gioalias.h" static void debug_print (const gchar *message, ...) @@ -1355,6 +1354,3 @@ _g_dbus_auth_run_server (GDBusAuth *auth, } /* ---------------------------------------------------------------------------------------------------- */ - -#define __G_DBUS_AUTH_C__ -#include "gioaliasdef.c" diff --git a/gio/gdbusauthmechanism.c b/gio/gdbusauthmechanism.c index ede990372..c2559929b 100644 --- a/gio/gdbusauthmechanism.c +++ b/gio/gdbusauthmechanism.c @@ -29,7 +29,6 @@ #include "giostream.h" #include "glibintl.h" -#include "gioalias.h" /* ---------------------------------------------------------------------------------------------------- */ @@ -340,6 +339,3 @@ _g_dbus_auth_mechanism_client_shutdown (GDBusAuthMechanism *mechanism) } /* ---------------------------------------------------------------------------------------------------- */ - -#define __G_DBUS_AUTH_MECHANISM_C__ -#include "gioaliasdef.c" diff --git a/gio/gdbusauthmechanismanon.c b/gio/gdbusauthmechanismanon.c index 2ab3f3ba1..601200d75 100644 --- a/gio/gdbusauthmechanismanon.c +++ b/gio/gdbusauthmechanismanon.c @@ -27,7 +27,6 @@ #include "gioenumtypes.h" #include "glibintl.h" -#include "gioalias.h" struct _GDBusAuthMechanismAnonPrivate { @@ -326,6 +325,3 @@ mechanism_client_shutdown (GDBusAuthMechanism *mechanism) } /* ---------------------------------------------------------------------------------------------------- */ - -#define __G_DBUS_AUTH_MECHANISM_ANON_C__ -#include "gioaliasdef.c" diff --git a/gio/gdbusauthmechanismexternal.c b/gio/gdbusauthmechanismexternal.c index ce6484e43..3fcb1ee22 100644 --- a/gio/gdbusauthmechanismexternal.c +++ b/gio/gdbusauthmechanismexternal.c @@ -34,7 +34,6 @@ #include "gioenumtypes.h" #include "glibintl.h" -#include "gioalias.h" struct _GDBusAuthMechanismExternalPrivate { @@ -403,6 +402,3 @@ mechanism_client_shutdown (GDBusAuthMechanism *mechanism) } /* ---------------------------------------------------------------------------------------------------- */ - -#define __G_DBUS_AUTH_MECHANISM_EXTERNAL_C__ -#include "gioaliasdef.c" diff --git a/gio/gdbusauthmechanismsha1.c b/gio/gdbusauthmechanismsha1.c index 9a471b091..badc1081b 100644 --- a/gio/gdbusauthmechanismsha1.c +++ b/gio/gdbusauthmechanismsha1.c @@ -43,7 +43,6 @@ #include "gdbusprivate.h" #include "glibintl.h" -#include "gioalias.h" struct _GDBusAuthMechanismSha1Private { @@ -1217,6 +1216,3 @@ mechanism_client_shutdown (GDBusAuthMechanism *mechanism) } /* ---------------------------------------------------------------------------------------------------- */ - -#define __G_DBUS_AUTH_MECHANISM_SHA1_C__ -#include "gioaliasdef.c" diff --git a/gio/gdbusauthobserver.c b/gio/gdbusauthobserver.c index 064515238..f1971c0ce 100644 --- a/gio/gdbusauthobserver.c +++ b/gio/gdbusauthobserver.c @@ -29,7 +29,6 @@ #include "giostream.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gdbusauthobserver @@ -264,8 +263,3 @@ g_dbus_auth_observer_authorize_authenticated_peer (GDBusAuthObserver *observer, &denied); return denied; } - - - -#define __G_DBUS_AUTH_OBSERVER_C__ -#include "gioaliasdef.c" diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c index 1cdabc2fb..4ae81ae9a 100644 --- a/gio/gdbusconnection.c +++ b/gio/gdbusconnection.c @@ -130,7 +130,6 @@ #endif #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gdbusconnection @@ -6026,6 +6025,3 @@ g_bus_get_finish (GAsyncResult *res, } /* ---------------------------------------------------------------------------------------------------- */ - -#define __G_DBUS_CONNECTION_C__ -#include "gioaliasdef.c" diff --git a/gio/gdbuserror.c b/gio/gdbuserror.c index 33105cf23..64a6bc69b 100644 --- a/gio/gdbuserror.c +++ b/gio/gdbuserror.c @@ -32,7 +32,6 @@ #include "gdbusprivate.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gdbuserror @@ -868,6 +867,3 @@ g_dbus_error_encode_gerror (const GError *error) return error_name; } - -#define __G_DBUS_ERROR_C__ -#include "gioaliasdef.c" diff --git a/gio/gdbusintrospection.c b/gio/gdbusintrospection.c index 56cfbbb5b..7530eb9e8 100644 --- a/gio/gdbusintrospection.c +++ b/gio/gdbusintrospection.c @@ -28,7 +28,6 @@ #include "gdbusintrospection.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gdbusintrospection @@ -2074,6 +2073,3 @@ g_dbus_node_info_lookup_interface (const GDBusNodeInfo *info, out: return result; } - -#define __G_DBUS_INTROSPECTION_C__ -#include "gioaliasdef.c" diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c index effdd3111..412c983dd 100644 --- a/gio/gdbusmessage.c +++ b/gio/gdbusmessage.c @@ -52,7 +52,6 @@ #endif #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gdbusmessage @@ -2834,7 +2833,3 @@ g_dbus_message_print (GDBusMessage *message, return g_string_free (str, FALSE); } - - -#define __G_DBUS_MESSAGE_C__ -#include "gioaliasdef.c" diff --git a/gio/gdbusmethodinvocation.c b/gio/gdbusmethodinvocation.c index 62aeb2146..df73c6708 100644 --- a/gio/gdbusmethodinvocation.c +++ b/gio/gdbusmethodinvocation.c @@ -33,7 +33,6 @@ #include "gdbusprivate.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gdbusmethodinvocation @@ -569,6 +568,3 @@ g_dbus_method_invocation_return_dbus_error (GDBusMethodInvocation *invocation, g_object_unref (invocation); } - -#define __G_DBUS_METHOD_INVOCATION_C__ -#include "gioaliasdef.c" diff --git a/gio/gdbusnameowning.c b/gio/gdbusnameowning.c index 2cdb0a7ba..9356d923a 100644 --- a/gio/gdbusnameowning.c +++ b/gio/gdbusnameowning.c @@ -31,7 +31,6 @@ #include "gdbusconnection.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gdbusnameowning @@ -908,6 +907,3 @@ g_bus_unown_name (guint owner_id) client_unref (client); } } - -#define __G_DBUS_NAME_OWNING_C__ -#include "gioaliasdef.c" diff --git a/gio/gdbusnamewatching.c b/gio/gdbusnamewatching.c index dcf3af96f..4f15a4c58 100644 --- a/gio/gdbusnamewatching.c +++ b/gio/gdbusnamewatching.c @@ -32,7 +32,6 @@ #include "gdbusconnection.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gdbusnamewatching @@ -849,6 +848,3 @@ g_bus_unwatch_name (guint watcher_id) client_unref (client); } } - -#define __G_DBUS_NAME_WATCHING_C__ -#include "gioaliasdef.c" diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c index 819aa3400..3dfb82947 100644 --- a/gio/gdbusprivate.c +++ b/gio/gdbusprivate.c @@ -52,7 +52,6 @@ #endif #include "glibintl.h" -#include "gioalias.h" /* ---------------------------------------------------------------------------------------------------- */ @@ -1445,6 +1444,3 @@ _g_dbus_enum_to_string (GType enum_type, gint value) } /* ---------------------------------------------------------------------------------------------------- */ - -#define __G_DBUS_PRIVATE_C__ -#include "gioaliasdef.c" diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c index f5abffeb7..fa2db2f0e 100644 --- a/gio/gdbusproxy.c +++ b/gio/gdbusproxy.c @@ -40,7 +40,6 @@ #include "gcancellable.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gdbusproxy @@ -2438,6 +2437,3 @@ g_dbus_proxy_call_sync (GDBusProxy *proxy, } /* ---------------------------------------------------------------------------------------------------- */ - -#define __G_DBUS_PROXY_C__ -#include "gioaliasdef.c" diff --git a/gio/gdbusserver.c b/gio/gdbusserver.c index 5996b47ba..abd464e18 100644 --- a/gio/gdbusserver.c +++ b/gio/gdbusserver.c @@ -56,7 +56,6 @@ #endif #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gdbusserver @@ -1111,6 +1110,3 @@ initable_iface_init (GInitableIface *initable_iface) } /* ---------------------------------------------------------------------------------------------------- */ - -#define __G_DBUS_SERVER_C__ -#include "gioaliasdef.c" diff --git a/gio/gdbusutils.c b/gio/gdbusutils.c index 2a1ca67eb..6ac9dfcda 100644 --- a/gio/gdbusutils.c +++ b/gio/gdbusutils.c @@ -28,7 +28,6 @@ #include "gdbusutils.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gdbusutils @@ -356,6 +355,3 @@ g_dbus_is_guid (const gchar *string) } /* ---------------------------------------------------------------------------------------------------- */ - -#define __G_DBUS_UTILS_C__ -#include "gioaliasdef.c" diff --git a/gio/gdelayedsettingsbackend.c b/gio/gdelayedsettingsbackend.c index 1edf57dec..f08ac0eb8 100644 --- a/gio/gdelayedsettingsbackend.c +++ b/gio/gdelayedsettingsbackend.c @@ -26,7 +26,6 @@ #include <string.h> -#include "gioalias.h" struct _GDelayedSettingsBackendPrivate { diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c index 4db17c46b..660068416 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c @@ -43,7 +43,6 @@ #include "giomodule-priv.h" #include "gappinfo.h" -#include "gioalias.h" /** * SECTION:gdesktopappinfo @@ -2706,6 +2705,3 @@ g_desktop_app_info_lookup_get_default_for_uri_scheme (GDesktopAppInfoLookup *loo return (* iface->get_default_for_uri_scheme) (lookup, uri_scheme); } - -#define __G_DESKTOP_APP_INFO_C__ -#include "gioaliasdef.c" diff --git a/gio/gdrive.c b/gio/gdrive.c index 2147b794f..af65339fb 100644 --- a/gio/gdrive.c +++ b/gio/gdrive.c @@ -28,7 +28,6 @@ #include "gioerror.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gdrive @@ -866,6 +865,3 @@ g_drive_stop_finish (GDrive *drive, return (* iface->stop_finish) (drive, result, error); } - -#define __G_DRIVE_C__ -#include "gioaliasdef.c" diff --git a/gio/gdummyfile.c b/gio/gdummyfile.c index 3e28b4767..4546e3c13 100644 --- a/gio/gdummyfile.c +++ b/gio/gdummyfile.c @@ -35,7 +35,6 @@ #include "gdummyfile.h" #include "gfile.h" -#include "gioalias.h" static void g_dummy_file_file_iface_init (GFileIface *iface); diff --git a/gio/gemblem.c b/gio/gemblem.c index 461fe2982..46a013779 100644 --- a/gio/gemblem.c +++ b/gio/gemblem.c @@ -29,7 +29,6 @@ #include <stdlib.h> #include <string.h> -#include "gioalias.h" /** * SECTION:gemblem @@ -358,6 +357,3 @@ g_emblem_iface_init (GIconIface *iface) iface->to_tokens = g_emblem_to_tokens; iface->from_tokens = g_emblem_from_tokens; } - -#define __G_EMBLEM_C__ -#include "gioaliasdef.c" diff --git a/gio/gemblemedicon.c b/gio/gemblemedicon.c index abfcf0c32..fdf3b3a22 100644 --- a/gio/gemblemedicon.c +++ b/gio/gemblemedicon.c @@ -31,7 +31,6 @@ #include "glibintl.h" #include "gioerror.h" -#include "gioalias.h" /** * SECTION:gemblemedicon @@ -350,6 +349,3 @@ g_emblemed_icon_icon_iface_init (GIconIface *iface) iface->to_tokens = g_emblemed_icon_to_tokens; iface->from_tokens = g_emblemed_icon_from_tokens; } - -#define __G_EMBLEMED_ICON_C__ -#include "gioaliasdef.c" diff --git a/gio/gfile.c b/gio/gfile.c index 1e0373541..b69332606 100644 --- a/gio/gfile.c +++ b/gio/gfile.c @@ -50,7 +50,6 @@ #include "gioerror.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gfile @@ -7226,6 +7225,3 @@ g_file_supports_thread_contexts (GFile *file) iface = G_FILE_GET_IFACE (file); return iface->supports_thread_contexts; } - -#define __G_FILE_C__ -#include "gioaliasdef.c" diff --git a/gio/gfileattribute.c b/gio/gfileattribute.c index 0aad1a743..3a50f4b45 100644 --- a/gio/gfileattribute.c +++ b/gio/gfileattribute.c @@ -29,7 +29,6 @@ #include <glib-object.h> #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gfileattribute @@ -1068,6 +1067,3 @@ g_file_attribute_info_list_add (GFileAttributeInfoList *list, list_update_public (priv); } - -#define __G_FILE_ATTRIBUTE_C__ -#include "gioaliasdef.c" diff --git a/gio/gfiledescriptorbased.c b/gio/gfiledescriptorbased.c index 8131cd676..6d4ef1375 100644 --- a/gio/gfiledescriptorbased.c +++ b/gio/gfiledescriptorbased.c @@ -24,7 +24,6 @@ #include "gfiledescriptorbased.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gfiledescriptorbased @@ -72,7 +71,3 @@ g_file_descriptor_based_get_fd (GFileDescriptorBased *fd_based) return (* iface->get_fd) (fd_based); } - - -#define __G_FILE_DESCRIPTOR_BASED_C__ -#include "gioaliasdef.c" diff --git a/gio/gfileenumerator.c b/gio/gfileenumerator.c index f9439d226..41686aa50 100644 --- a/gio/gfileenumerator.c +++ b/gio/gfileenumerator.c @@ -30,7 +30,6 @@ #include "gioerror.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gfileenumerator @@ -759,6 +758,3 @@ g_file_enumerator_real_close_finish (GFileEnumerator *enumerator, g_file_enumerator_real_close_async); return TRUE; } - -#define __G_FILE_ENUMERATOR_C__ -#include "gioaliasdef.c" diff --git a/gio/gfileicon.c b/gio/gfileicon.c index 4842fb6f1..0f22b2324 100644 --- a/gio/gfileicon.c +++ b/gio/gfileicon.c @@ -31,7 +31,6 @@ #include "gsimpleasyncresult.h" #include "gioerror.h" -#include "gioalias.h" /** * SECTION:gfileicon @@ -383,6 +382,3 @@ g_file_icon_loadable_icon_iface_init (GLoadableIconIface *iface) iface->load_async = g_file_icon_load_async; iface->load_finish = g_file_icon_load_finish; } - -#define __G_FILE_ICON_C__ -#include "gioaliasdef.c" diff --git a/gio/gfileinfo.c b/gio/gfileinfo.c index b101af468..3426b13f8 100644 --- a/gio/gfileinfo.c +++ b/gio/gfileinfo.c @@ -62,7 +62,6 @@ #include "gicon.h" #include "glibintl.h" -#include "gioalias.h" /* We use this nasty thing, because NULL is a valid attribute matcher (matches nothing) */ #define NO_ATTRIBUTE_MASK ((GFileAttributeMatcher *)1) @@ -2499,6 +2498,3 @@ g_file_attribute_matcher_enumerate_next (GFileAttributeMatcher *matcher) return get_attribute_for_id (sub_matcher->id); } } - -#define __G_FILE_INFO_C__ -#include "gioaliasdef.c" diff --git a/gio/gfileinputstream.c b/gio/gfileinputstream.c index 502584b85..a710dfe94 100644 --- a/gio/gfileinputstream.c +++ b/gio/gfileinputstream.c @@ -31,7 +31,6 @@ #include "gioerror.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gfileinputstream @@ -467,7 +466,3 @@ g_file_input_stream_real_query_info_finish (GFileInputStream *stream, return NULL; } - -#define __G_FILE_INPUT_STREAM_C__ -#include "gioaliasdef.c" - diff --git a/gio/gfileiostream.c b/gio/gfileiostream.c index d7bff9df9..258dc053e 100644 --- a/gio/gfileiostream.c +++ b/gio/gfileiostream.c @@ -32,7 +32,6 @@ #include "gfileoutputstream.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gfileiostream @@ -672,6 +671,3 @@ g_file_io_stream_class_init (GFileIOStreamClass *klass) klass->query_info_finish = g_file_io_stream_real_query_info_finish; klass->get_etag = g_file_io_stream_real_get_etag; } - -#define __G_FILE_IO_STREAM_C__ -#include "gioaliasdef.c" diff --git a/gio/gfilemonitor.c b/gio/gfilemonitor.c index a470baa18..38a0493bc 100644 --- a/gio/gfilemonitor.c +++ b/gio/gfilemonitor.c @@ -30,7 +30,6 @@ #include "gvfs.h" #include "glibintl.h" -#include "gioalias.h" struct _FileChange; typedef struct _FileChange FileChange; @@ -726,6 +725,3 @@ g_file_monitor_emit_event (GFileMonitor *monitor, update_rate_limiter_timeout (monitor, limiter->send_virtual_changes_done_at); } } - -#define __G_FILE_MONITOR_C__ -#include "gioaliasdef.c" diff --git a/gio/gfilenamecompleter.c b/gio/gfilenamecompleter.c index 19a8f162b..e84b17f73 100644 --- a/gio/gfilenamecompleter.c +++ b/gio/gfilenamecompleter.c @@ -30,7 +30,6 @@ #include <string.h> #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gfilenamecompleter @@ -515,6 +514,3 @@ g_filename_completer_set_dirs_only (GFilenameCompleter *completer, completer->dirs_only = dirs_only; } - -#define __G_FILENAME_COMPLETER_C__ -#include "gioaliasdef.c" diff --git a/gio/gfileoutputstream.c b/gio/gfileoutputstream.c index 832042e6f..347b42d86 100644 --- a/gio/gfileoutputstream.c +++ b/gio/gfileoutputstream.c @@ -31,7 +31,6 @@ #include "gioerror.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gfileoutputstream @@ -570,6 +569,3 @@ g_file_output_stream_real_query_info_finish (GFileOutputStream *stream, return NULL; } - -#define __G_FILE_OUTPUT_STREAM_C__ -#include "gioaliasdef.c" diff --git a/gio/gfilterinputstream.c b/gio/gfilterinputstream.c index 2cb8b2958..0f87984af 100644 --- a/gio/gfilterinputstream.c +++ b/gio/gfilterinputstream.c @@ -26,7 +26,6 @@ #include "gsimpleasyncresult.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gfilterinputstream @@ -313,6 +312,3 @@ g_filter_input_stream_close (GInputStream *stream, return res; } - -#define __G_FILTER_INPUT_STREAM_C__ -#include "gioaliasdef.c" diff --git a/gio/gfilteroutputstream.c b/gio/gfilteroutputstream.c index aa7650009..673896914 100644 --- a/gio/gfilteroutputstream.c +++ b/gio/gfilteroutputstream.c @@ -26,7 +26,6 @@ #include "goutputstream.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gfilteroutputstream @@ -307,6 +306,3 @@ g_filter_output_stream_close (GOutputStream *stream, return res; } - -#define __G_FILTER_OUTPUT_STREAM_C__ -#include "gioaliasdef.c" diff --git a/gio/gicon.c b/gio/gicon.c index 5c0083e52..d821f27e8 100644 --- a/gio/gicon.c +++ b/gio/gicon.c @@ -33,7 +33,6 @@ #include "glibintl.h" -#include "gioalias.h" /* There versioning of this is implicit, version 1 would be ".1 " */ #define G_ICON_SERIALIZATION_MAGIC0 ". " @@ -450,7 +449,3 @@ g_icon_new_for_string (const gchar *str, return icon; } - - -#define __G_ICON_C__ -#include "gioaliasdef.c" diff --git a/gio/ginetaddress.c b/gio/ginetaddress.c index f6c5d5b35..429cac25c 100644 --- a/gio/ginetaddress.c +++ b/gio/ginetaddress.c @@ -33,7 +33,6 @@ #include "glibintl.h" #include "gnetworkingprivate.h" -#include "gioalias.h" /** * SECTION:ginetaddress @@ -866,6 +865,3 @@ g_inet_address_get_is_mc_site_local (GInetAddress *address) else return IN6_IS_ADDR_MC_SITELOCAL (&address->priv->addr.ipv6); } - -#define __G_INET_ADDRESS_C__ -#include "gioaliasdef.c" diff --git a/gio/ginetsocketaddress.c b/gio/ginetsocketaddress.c index 3fc584a30..d1e32e416 100644 --- a/gio/ginetsocketaddress.c +++ b/gio/ginetsocketaddress.c @@ -31,7 +31,6 @@ #include "gioerror.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:ginetsocketaddress @@ -320,6 +319,3 @@ g_inet_socket_address_get_port (GInetSocketAddress *address) return address->priv->port; } - -#define __G_INET_SOCKET_ADDRESS_C__ -#include "gioaliasdef.c" diff --git a/gio/ginitable.c b/gio/ginitable.c index dbf8e7594..de59e206f 100644 --- a/gio/ginitable.c +++ b/gio/ginitable.c @@ -24,7 +24,6 @@ #include "ginitable.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:ginitable @@ -224,6 +223,3 @@ g_initable_new_valist (GType object_type, return obj; } - -#define __G_INITABLE_C__ -#include "gioaliasdef.c" diff --git a/gio/ginputstream.c b/gio/ginputstream.c index 215d6acc2..8e2d07b5a 100644 --- a/gio/ginputstream.c +++ b/gio/ginputstream.c @@ -31,7 +31,6 @@ #include "gsimpleasyncresult.h" #include "gioerror.h" -#include "gioalias.h" /** * SECTION:ginputstream @@ -1204,6 +1203,3 @@ g_input_stream_real_close_finish (GInputStream *stream, g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_input_stream_real_close_async); return TRUE; } - -#define __G_INPUT_STREAM_C__ -#include "gioaliasdef.c" diff --git a/gio/gio.symbols b/gio/gio.symbols index abe883574..1163edfec 100644 --- a/gio/gio.symbols +++ b/gio/gio.symbols @@ -1,7 +1,5 @@ /* This file lists all exported symbols. It is used to generate - * the gio.def file used to control exports on Windows and the - * gioalias.h/gioaliasdef.c files used to avoid PLT entries for - * internal uses of exported functions (see makegioalias.pl). + * the gio.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/gio/gioenumtypes.c.template b/gio/gioenumtypes.c.template index 46db90560..ac2c391f5 100644 --- a/gio/gioenumtypes.c.template +++ b/gio/gioenumtypes.c.template @@ -1,6 +1,5 @@ /*** BEGIN file-header ***/ #include <gio.h> -#include "gioalias.h" /*** END file-header ***/ @@ -35,8 +34,3 @@ GType } /*** END value-tail ***/ - -/*** BEGIN file-tail ***/ -#define __GIO_ENUM_TYPES_C__ -#include "gioaliasdef.c" -/*** END file-tail ***/ diff --git a/gio/gioerror.c b/gio/gioerror.c index 8a1ee4f49..9bd400455 100644 --- a/gio/gioerror.c +++ b/gio/gioerror.c @@ -24,7 +24,6 @@ #include <errno.h> #include "gioerror.h" -#include "gioalias.h" /** * SECTION:gioerror @@ -232,6 +231,3 @@ g_io_error_from_win32_error (gint error_code) } #endif - -#define __G_IO_ERROR_C__ -#include "gioaliasdef.c" diff --git a/gio/giomodule.c b/gio/giomodule.c index e1b1d1748..d9dbda6b2 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c @@ -34,7 +34,6 @@ #ifdef G_OS_UNIX #include "gdesktopappinfo.h" #endif -#include "gioalias.h" #include <glib/gstdio.h> /** @@ -896,6 +895,3 @@ g_io_extension_get_priority (GIOExtension *extension) { return extension->priority; } - -#define __G_IO_MODULE_C__ -#include "gioaliasdef.c" diff --git a/gio/gioscheduler.c b/gio/gioscheduler.c index 178726665..61e1afcca 100644 --- a/gio/gioscheduler.c +++ b/gio/gioscheduler.c @@ -25,7 +25,6 @@ #include "gioscheduler.h" #include "gcancellable.h" -#include "gioalias.h" /** * SECTION:gioscheduler @@ -460,7 +459,3 @@ g_io_scheduler_job_send_to_mainloop_async (GIOSchedulerJob *job, g_source_attach (source, job->context); g_source_unref (source); } - - -#define __G_IO_SCHEDULER_C__ -#include "gioaliasdef.c" diff --git a/gio/giostream.c b/gio/giostream.c index d7850117e..be0483689 100644 --- a/gio/giostream.c +++ b/gio/giostream.c @@ -30,7 +30,6 @@ #include <gio/gsimpleasyncresult.h> #include <gio/gasyncresult.h> -#include "gioalias.h" G_DEFINE_TYPE (GIOStream, g_io_stream, G_TYPE_OBJECT); @@ -609,6 +608,3 @@ g_io_stream_real_close_finish (GIOStream *stream, g_io_stream_real_close_async); return TRUE; } - -#define __G_IO_STREAM_C__ -#include "gioaliasdef.c" diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend.c index 0306585ad..14f4384cc 100644 --- a/gio/gkeyfilesettingsbackend.c +++ b/gio/gkeyfilesettingsbackend.c @@ -32,7 +32,6 @@ #include "gsimplepermission.h" #include "gsettingsbackend.h" -#include "gioalias.h" #define G_TYPE_KEYFILE_SETTINGS_BACKEND (g_keyfile_settings_backend_get_type ()) #define G_KEYFILE_SETTINGS_BACKEND(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ @@ -678,6 +677,3 @@ g_keyfile_settings_backend_new (const gchar *filename, return G_SETTINGS_BACKEND (kfsb); } - -#define __G_KEYFILE_SETTINGS_BACKEND_C__ -#include "gioaliasdef.c" diff --git a/gio/gloadableicon.c b/gio/gloadableicon.c index 9221d353c..8d21dba96 100644 --- a/gio/gloadableicon.c +++ b/gio/gloadableicon.c @@ -27,7 +27,6 @@ #include "gloadableicon.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gloadableicon @@ -239,6 +238,3 @@ g_loadable_icon_real_load_finish (GLoadableIcon *icon, return g_object_ref (data->stream); } - -#define __G_LOADABLE_ICON_C__ -#include "gioaliasdef.c" diff --git a/gio/glocaldirectorymonitor.c b/gio/glocaldirectorymonitor.c index 6aea9a049..0266dc0ef 100644 --- a/gio/glocaldirectorymonitor.c +++ b/gio/glocaldirectorymonitor.c @@ -31,7 +31,6 @@ #include <string.h> -#include "gioalias.h" enum { @@ -313,6 +312,3 @@ g_local_directory_monitor_cancel (GFileMonitor *monitor) return TRUE; } - -#define __G_LOCAL_DIRECTORY_MONITOR_C__ -#include "gioaliasdef.c" diff --git a/gio/glocalfile.c b/gio/glocalfile.c index a278f34f9..4641f2e91 100644 --- a/gio/glocalfile.c +++ b/gio/glocalfile.c @@ -105,7 +105,6 @@ #endif #endif -#include "gioalias.h" static void g_local_file_file_iface_init (GFileIface *iface); diff --git a/gio/glocalfileenumerator.c b/gio/glocalfileenumerator.c index e39c05071..3aa1f8884 100644 --- a/gio/glocalfileenumerator.c +++ b/gio/glocalfileenumerator.c @@ -31,7 +31,6 @@ #include <stdlib.h> #include "glibintl.h" -#include "gioalias.h" #define CHUNK_SIZE 1000 @@ -387,5 +386,3 @@ g_local_file_enumerator_close (GFileEnumerator *enumerator, return TRUE; } - - diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c index 6b5226792..4e9f43f85 100644 --- a/gio/glocalfileinfo.c +++ b/gio/glocalfileinfo.c @@ -94,7 +94,6 @@ #include "gcontenttype.h" #include "gcontenttypeprivate.h" -#include "gioalias.h" struct ThumbMD5Context { guint32 buf[4]; diff --git a/gio/glocalfileinputstream.c b/gio/glocalfileinputstream.c index 5988a4faa..5aa436d21 100644 --- a/gio/glocalfileinputstream.c +++ b/gio/glocalfileinputstream.c @@ -46,7 +46,6 @@ #include <io.h> #endif -#include "gioalias.h" #ifdef G_OS_UNIX diff --git a/gio/glocalfileiostream.c b/gio/glocalfileiostream.c index 5a421ddb8..5e4792b5b 100644 --- a/gio/glocalfileiostream.c +++ b/gio/glocalfileiostream.c @@ -35,7 +35,6 @@ #include "gfiledescriptorbased.h" #endif -#include "gioalias.h" #define g_local_file_io_stream_get_type _g_local_file_io_stream_get_type G_DEFINE_TYPE (GLocalFileIOStream, g_local_file_io_stream, G_TYPE_FILE_IO_STREAM); diff --git a/gio/glocalfilemonitor.c b/gio/glocalfilemonitor.c index 8405d3a0e..91d524f5e 100644 --- a/gio/glocalfilemonitor.c +++ b/gio/glocalfilemonitor.c @@ -30,7 +30,6 @@ #include <string.h> -#include "gioalias.h" enum { @@ -223,6 +222,3 @@ _g_local_file_monitor_new (const char *pathname, return monitor; } - -#define __G_LOCAL_FILE_MONITOR_C__ -#include "gioaliasdef.c" diff --git a/gio/glocalfileoutputstream.c b/gio/glocalfileoutputstream.c index d080fef16..40576a9cc 100644 --- a/gio/glocalfileoutputstream.c +++ b/gio/glocalfileoutputstream.c @@ -57,7 +57,6 @@ #define O_BINARY 0 #endif -#include "gioalias.h" #ifdef G_OS_UNIX static void g_file_descriptor_based_iface_init (GFileDescriptorBasedIface *iface); diff --git a/gio/glocalvfs.c b/gio/glocalvfs.c index cd535e38a..f2eaea2c7 100644 --- a/gio/glocalvfs.c +++ b/gio/glocalvfs.c @@ -33,7 +33,6 @@ #endif #include <string.h> -#include "gioalias.h" struct _GLocalVfs { diff --git a/gio/gmemoryinputstream.c b/gio/gmemoryinputstream.c index bb6001bb4..397c6a5b9 100644 --- a/gio/gmemoryinputstream.c +++ b/gio/gmemoryinputstream.c @@ -29,7 +29,6 @@ #include "gioerror.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gmemoryinputstream @@ -521,6 +520,3 @@ g_memory_input_stream_truncate (GSeekable *seekable, _("Cannot truncate GMemoryInputStream")); return FALSE; } - -#define __G_MEMORY_INPUT_STREAM_C__ -#include "gioaliasdef.c" diff --git a/gio/gmemoryoutputstream.c b/gio/gmemoryoutputstream.c index 6b20c0add..eada0a780 100644 --- a/gio/gmemoryoutputstream.c +++ b/gio/gmemoryoutputstream.c @@ -31,7 +31,6 @@ #include "string.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gmemoryoutputstream @@ -768,6 +767,3 @@ g_memory_output_stream_truncate (GSeekable *seekable, return TRUE; } - -#define __G_MEMORY_OUTPUT_STREAM_C__ -#include "gioaliasdef.c" diff --git a/gio/gmemorysettingsbackend.c b/gio/gmemorysettingsbackend.c index 4a74abeda..26a0d791f 100644 --- a/gio/gmemorysettingsbackend.c +++ b/gio/gmemorysettingsbackend.c @@ -26,7 +26,6 @@ #include "gsettingsbackend.h" #include "giomodule.h" -#include "gioalias.h" #define G_TYPE_MEMORY_SETTINGS_BACKEND (g_memory_settings_backend_get_type()) #define G_MEMORY_SETTINGS_BACKEND(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ diff --git a/gio/gmount.c b/gio/gmount.c index 3e80dfbef..270cfc362 100644 --- a/gio/gmount.c +++ b/gio/gmount.c @@ -34,7 +34,6 @@ #include "gioerror.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gmount @@ -1010,6 +1009,3 @@ g_mount_unshadow (GMount *mount) g_warning ("Shadow ref count on GMount is negative"); G_UNLOCK (priv_lock); } - -#define __G_MOUNT_C__ -#include "gioaliasdef.c" diff --git a/gio/gmountoperation.c b/gio/gmountoperation.c index 35927d410..a6bac9b86 100644 --- a/gio/gmountoperation.c +++ b/gio/gmountoperation.c @@ -29,7 +29,6 @@ #include "gio-marshal.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gmountoperation @@ -708,6 +707,3 @@ g_mount_operation_reply (GMountOperation *op, g_return_if_fail (G_IS_MOUNT_OPERATION (op)); g_signal_emit (op, signals[REPLY], 0, result); } - -#define __G_MOUNT_OPERATION_C__ -#include "gioaliasdef.c" diff --git a/gio/gnativevolumemonitor.c b/gio/gnativevolumemonitor.c index 71c0c5a1f..71e8936f1 100644 --- a/gio/gnativevolumemonitor.c +++ b/gio/gnativevolumemonitor.c @@ -27,7 +27,6 @@ #include <glib.h> #include "gnativevolumemonitor.h" -#include "gioalias.h" G_DEFINE_ABSTRACT_TYPE (GNativeVolumeMonitor, g_native_volume_monitor, G_TYPE_VOLUME_MONITOR); @@ -51,6 +50,3 @@ static void g_native_volume_monitor_init (GNativeVolumeMonitor *native_monitor) { } - -#define __G_NATIVE_VOLUME_MONITOR_C__ -#include "gioaliasdef.c" diff --git a/gio/gnetworkaddress.c b/gio/gnetworkaddress.c index 16af7f5a0..8f5bfa28e 100644 --- a/gio/gnetworkaddress.c +++ b/gio/gnetworkaddress.c @@ -38,7 +38,6 @@ #include <string.h> -#include "gioalias.h" /** * SECTION:gnetworkaddress @@ -615,6 +614,3 @@ g_network_address_connectable_enumerate (GSocketConnectable *connectable) return (GSocketAddressEnumerator *)addr_enum; } - -#define __G_NETWORK_ADDRESS_C__ -#include "gioaliasdef.c" diff --git a/gio/gnetworkservice.c b/gio/gnetworkservice.c index 31bbf6a5c..607e45eca 100644 --- a/gio/gnetworkservice.c +++ b/gio/gnetworkservice.c @@ -37,7 +37,6 @@ #include <stdlib.h> #include <string.h> -#include "gioalias.h" /** * SECTION:gnetworkservice @@ -660,6 +659,3 @@ g_network_service_connectable_enumerate (GSocketConnectable *connectable) return (GSocketAddressEnumerator *)srv_enum; } - -#define __G_NETWORK_SERVICE_C__ -#include "gioaliasdef.c" diff --git a/gio/gnullapplication.c b/gio/gnullapplication.c index 377203f78..83c1cee81 100644 --- a/gio/gnullapplication.c +++ b/gio/gnullapplication.c @@ -72,4 +72,3 @@ _g_application_platform_activate (GApplication *app, { exit (0); } - diff --git a/gio/gnullsettingsbackend.c b/gio/gnullsettingsbackend.c index df0f67629..961b881b1 100644 --- a/gio/gnullsettingsbackend.c +++ b/gio/gnullsettingsbackend.c @@ -24,7 +24,6 @@ #include "gnullsettingsbackend.h" #include "gsimplepermission.h" -#include "gioalias.h" #define G_TYPE_NULL_SETTINGS_BACKEND (g_null_settings_backend_get_type ()) #define G_NULL_SETTINGS_BACKEND(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ diff --git a/gio/goutputstream.c b/gio/goutputstream.c index d79d93db1..4881873f3 100644 --- a/gio/goutputstream.c +++ b/gio/goutputstream.c @@ -29,7 +29,6 @@ #include "gioerror.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:goutputstream @@ -1473,6 +1472,3 @@ g_output_stream_real_close_finish (GOutputStream *stream, g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_output_stream_real_close_async); return TRUE; } - -#define __G_OUTPUT_STREAM_C__ -#include "gioaliasdef.c" diff --git a/gio/gpermission.c b/gio/gpermission.c index 275460fbc..a6963505a 100644 --- a/gio/gpermission.c +++ b/gio/gpermission.c @@ -24,7 +24,6 @@ #include "gpermission.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gpermission @@ -414,6 +413,3 @@ g_permission_class_init (GPermissionClass *class) g_type_class_add_private (class, sizeof (GPermissionPrivate)); } - -#define __G_PERMISSION_C__ -#include "gioaliasdef.c" diff --git a/gio/gpollfilemonitor.c b/gio/gpollfilemonitor.c index 51d04efc6..c516bbd86 100644 --- a/gio/gpollfilemonitor.c +++ b/gio/gpollfilemonitor.c @@ -28,7 +28,6 @@ #include "gfilemonitor.h" #include "gfileinfo.h" -#include "gioalias.h" static gboolean g_poll_file_monitor_cancel (GFileMonitor* monitor); static void schedule_poll_timeout (GPollFileMonitor* poll_monitor); diff --git a/gio/gresolver.c b/gio/gresolver.c index e7dd8ade6..97daa1b71 100644 --- a/gio/gresolver.c +++ b/gio/gresolver.c @@ -42,7 +42,6 @@ #include <stdlib.h> -#include "gioalias.h" /** * SECTION:gresolver @@ -930,6 +929,3 @@ _g_resolver_targets_from_DnsQuery (const gchar *rrname, } #endif - -#define __G_RESOLVER_C__ -#include "gioaliasdef.c" diff --git a/gio/gseekable.c b/gio/gseekable.c index 04af1f865..78b7108c8 100644 --- a/gio/gseekable.c +++ b/gio/gseekable.c @@ -24,7 +24,6 @@ #include "gseekable.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gseekable @@ -174,6 +173,3 @@ g_seekable_truncate (GSeekable *seekable, return (* iface->truncate_fn) (seekable, offset, cancellable, error); } - -#define __G_SEEKABLE_C__ -#include "gioaliasdef.c" diff --git a/gio/gsettings.c b/gio/gsettings.c index b914f4fce..3c7b4fcbd 100644 --- a/gio/gsettings.c +++ b/gio/gsettings.c @@ -37,7 +37,6 @@ #include <string.h> -#include "gioalias.h" #include "strinfo.c" @@ -2650,7 +2649,5 @@ g_settings_unbind (gpointer object, } /* Epilogue {{{1 */ -#define __G_SETTINGS_C__ -#include "gioaliasdef.c" /* vim:set foldmethod=marker: */ diff --git a/gio/gsettingsbackend.c b/gio/gsettingsbackend.c index c432b2179..0e4c2abb3 100644 --- a/gio/gsettingsbackend.c +++ b/gio/gsettingsbackend.c @@ -34,7 +34,6 @@ #include <glib.h> #include <glibintl.h> -#include "gioalias.h" G_DEFINE_ABSTRACT_TYPE (GSettingsBackend, g_settings_backend, G_TYPE_OBJECT) @@ -1081,6 +1080,3 @@ g_settings_backend_sync_default (void) if (class->sync) class->sync (backend); } - -#define __G_SETTINGS_BACKEND_C__ -#include "gioaliasdef.c" diff --git a/gio/gsimpleasyncresult.c b/gio/gsimpleasyncresult.c index 6121dc069..71387fad1 100644 --- a/gio/gsimpleasyncresult.c +++ b/gio/gsimpleasyncresult.c @@ -38,7 +38,6 @@ #include <gio/gioerror.h> #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gsimpleasyncresult @@ -836,6 +835,3 @@ g_simple_async_report_gerror_in_idle (GObject *object, g_simple_async_result_complete_in_idle (simple); g_object_unref (simple); } - -#define __G_SIMPLE_ASYNC_RESULT_C__ -#include "gioaliasdef.c" diff --git a/gio/gsimplepermission.c b/gio/gsimplepermission.c index 9f3da22e3..54cc00e21 100644 --- a/gio/gsimplepermission.c +++ b/gio/gsimplepermission.c @@ -24,7 +24,6 @@ #include "gsimplepermission.h" #include "gpermission.h" -#include "gioalias.h" /** * SECTION:gsimplepermission @@ -83,6 +82,3 @@ g_simple_permission_new (gboolean allowed) return permission; } - -#define __G_SIMPLE_PERMISSION_C__ -#include "gioaliasdef.c" diff --git a/gio/gsocket.c b/gio/gsocket.c index b635f9fd5..298f5249e 100644 --- a/gio/gsocket.c +++ b/gio/gsocket.c @@ -55,7 +55,6 @@ #include "gsocketcontrolmessage.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gsocket @@ -3319,6 +3318,3 @@ g_socket_receive_message (GSocket *socket, } #endif } - -#define __G_SOCKET_C__ -#include "gioaliasdef.c" diff --git a/gio/gsocketaddress.c b/gio/gsocketaddress.c index 04c666468..6511e57c3 100644 --- a/gio/gsocketaddress.c +++ b/gio/gsocketaddress.c @@ -37,7 +37,6 @@ #include "gunixsocketaddress.h" #endif -#include "gioalias.h" /** * SECTION:gsocketaddress @@ -352,6 +351,3 @@ g_socket_address_connectable_enumerate (GSocketConnectable *connectable) return (GSocketAddressEnumerator *)sockaddr_enum; } - -#define __G_SOCKET_ADDRESS_C__ -#include "gioaliasdef.c" diff --git a/gio/gsocketaddressenumerator.c b/gio/gsocketaddressenumerator.c index 1ae69d22f..f1b5a2d32 100644 --- a/gio/gsocketaddressenumerator.c +++ b/gio/gsocketaddressenumerator.c @@ -24,7 +24,6 @@ #include "gsimpleasyncresult.h" -#include "gioalias.h" G_DEFINE_ABSTRACT_TYPE (GSocketAddressEnumerator, g_socket_address_enumerator, G_TYPE_OBJECT); @@ -186,6 +185,3 @@ g_socket_address_enumerator_next_finish (GSocketAddressEnumerator *enumerator, return (* klass->next_finish) (enumerator, result, error); } - -#define __G_SOCKET_ADDRESS_ENUMERATOR_C__ -#include "gioaliasdef.c" diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c index 7908aec78..e05917cbb 100644 --- a/gio/gsocketclient.c +++ b/gio/gsocketclient.c @@ -40,7 +40,6 @@ #include <gio/gsocketaddress.h> #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gsocketclient @@ -1008,6 +1007,3 @@ g_socket_client_connect_to_service_finish (GSocketClient *client, { return g_socket_client_connect_finish (client, result, error); } - -#define __G_SOCKET_CLIENT_C__ -#include "gioaliasdef.c" diff --git a/gio/gsocketconnectable.c b/gio/gsocketconnectable.c index c58d6e037..dc2821cc0 100644 --- a/gio/gsocketconnectable.c +++ b/gio/gsocketconnectable.c @@ -22,7 +22,6 @@ #include "gsocketconnectable.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gsocketconnectable @@ -121,6 +120,3 @@ g_socket_connectable_enumerate (GSocketConnectable *connectable) return (* iface->enumerate) (connectable); } - -#define __G_SOCKET_CONNECTABLE_C__ -#include "gioaliasdef.c" diff --git a/gio/gsocketconnection.c b/gio/gsocketconnection.c index 12ea7127d..0058adb3a 100644 --- a/gio/gsocketconnection.c +++ b/gio/gsocketconnection.c @@ -37,7 +37,6 @@ #include "gtcpconnection.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gsocketconnection @@ -519,6 +518,3 @@ g_socket_connection_factory_create_connection (GSocket *socket) g_socket_get_protocol (socket)); return g_object_new (type, "socket", socket, NULL); } - -#define __G_SOCKET_CONNECTION_C__ -#include "gioaliasdef.c" diff --git a/gio/gsocketcontrolmessage.c b/gio/gsocketcontrolmessage.c index f576a3467..19a62b675 100644 --- a/gio/gsocketcontrolmessage.c +++ b/gio/gsocketcontrolmessage.c @@ -51,7 +51,6 @@ #include "gunixfdmessage.h" #endif -#include "gioalias.h" G_DEFINE_ABSTRACT_TYPE (GSocketControlMessage, g_socket_control_message, @@ -211,6 +210,3 @@ g_socket_control_message_deserialize (int level, return message; } - -#define __G_SOCKET_CONTROL_MESSAGE_C__ -#include "gioaliasdef.c" diff --git a/gio/gsocketinputstream.c b/gio/gsocketinputstream.c index 1c3dbbcdf..4b26ed4b9 100644 --- a/gio/gsocketinputstream.c +++ b/gio/gsocketinputstream.c @@ -31,7 +31,6 @@ #include <gio/gcancellable.h> #include <gio/gioerror.h> -#include "gioalias.h" #define g_socket_input_stream_get_type _g_socket_input_stream_get_type G_DEFINE_TYPE (GSocketInputStream, g_socket_input_stream, G_TYPE_INPUT_STREAM); @@ -242,6 +241,3 @@ _g_socket_input_stream_new (GSocket *socket) { return G_SOCKET_INPUT_STREAM (g_object_new (G_TYPE_SOCKET_INPUT_STREAM, "socket", socket, NULL)); } - -#define __G_SOCKET_INPUT_STREAM_C__ -#include "gioaliasdef.c" diff --git a/gio/gsocketlistener.c b/gio/gsocketlistener.c index adbac5c29..62ec2fcc6 100644 --- a/gio/gsocketlistener.c +++ b/gio/gsocketlistener.c @@ -38,7 +38,6 @@ #include <gio/ginetsocketaddress.h> #include "glibintl.h" -#include "gioalias.h" /** * SECTION: gsocketlistener @@ -1151,6 +1150,3 @@ g_socket_listener_add_any_inet_port (GSocketListener *listener, return candidate_port; } - -#define __G_SOCKET_LISTENER_C__ -#include "gioaliasdef.c" diff --git a/gio/gsocketoutputstream.c b/gio/gsocketoutputstream.c index bf4ee78d6..e79e261ab 100644 --- a/gio/gsocketoutputstream.c +++ b/gio/gsocketoutputstream.c @@ -33,7 +33,6 @@ #include <gio/gioerror.h> #include "glibintl.h" -#include "gioalias.h" #define g_socket_output_stream_get_type _g_socket_output_stream_get_type G_DEFINE_TYPE (GSocketOutputStream, g_socket_output_stream, G_TYPE_OUTPUT_STREAM); @@ -244,6 +243,3 @@ _g_socket_output_stream_new (GSocket *socket) { return G_SOCKET_OUTPUT_STREAM (g_object_new (G_TYPE_SOCKET_OUTPUT_STREAM, "socket", socket, NULL)); } - -#define __G_SOCKET_OUTPUT_STREAM_C__ -#include "gioaliasdef.c" diff --git a/gio/gsocketservice.c b/gio/gsocketservice.c index a7bd8f106..e9aab5e63 100644 --- a/gio/gsocketservice.c +++ b/gio/gsocketservice.c @@ -64,7 +64,6 @@ #include "gsocketlistener.h" #include "gsocketconnection.h" -#include "gioalias.h" static guint g_socket_service_incoming_signal; @@ -326,6 +325,3 @@ g_socket_service_new (void) { return g_object_new (G_TYPE_SOCKET_SERVICE, NULL); } - -#define __G_SOCKET_SERVICE_C__ -#include "gioaliasdef.c" diff --git a/gio/gsrvtarget.c b/gio/gsrvtarget.c index 526b0ddfb..ac7062762 100644 --- a/gio/gsrvtarget.c +++ b/gio/gsrvtarget.c @@ -29,7 +29,6 @@ #include <stdlib.h> #include <string.h> -#include "gioalias.h" /** * SECTION:gsrvtarget @@ -326,6 +325,3 @@ g_srv_target_list_sort (GList *targets) return out; } - -#define __G_SRV_TARGET_C__ -#include "gioaliasdef.c" diff --git a/gio/gtcpconnection.c b/gio/gtcpconnection.c index 59f9c1beb..15e1a9a61 100644 --- a/gio/gtcpconnection.c +++ b/gio/gtcpconnection.c @@ -34,7 +34,6 @@ #include "giostream.h" #include "glibintl.h" -#include "gioalias.h" G_DEFINE_TYPE_WITH_CODE (GTcpConnection, g_tcp_connection, G_TYPE_SOCKET_CONNECTION, @@ -376,7 +375,3 @@ g_tcp_connection_get_graceful_disconnect (GTcpConnection *connection) { return connection->priv->graceful_disconnect; } - - -#define __G_TCP_CONNECTION_C__ -#include "gioaliasdef.c" diff --git a/gio/gthemedicon.c b/gio/gthemedicon.c index 7b6f1937e..1380e83fb 100644 --- a/gio/gthemedicon.c +++ b/gio/gthemedicon.c @@ -29,7 +29,6 @@ #include "gioerror.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gthemedicon @@ -521,6 +520,3 @@ g_themed_icon_icon_iface_init (GIconIface *iface) iface->to_tokens = g_themed_icon_to_tokens; iface->from_tokens = g_themed_icon_from_tokens; } - -#define __G_THEMED_ICON_C__ -#include "gioaliasdef.c" diff --git a/gio/gthreadedresolver.c b/gio/gthreadedresolver.c index bd7a82985..8c98f476e 100644 --- a/gio/gthreadedresolver.c +++ b/gio/gthreadedresolver.c @@ -34,7 +34,6 @@ #include "gsimpleasyncresult.h" #include "gsocketaddress.h" -#include "gioalias.h" G_DEFINE_TYPE (GThreadedResolver, g_threaded_resolver, G_TYPE_RESOLVER) @@ -615,6 +614,3 @@ g_threaded_resolver_class_init (GThreadedResolverClass *threaded_class) object_class->finalize = finalize; } - -#define __G_THREADED_RESOLVER_C__ -#include "gioaliasdef.c" diff --git a/gio/gthreadedsocketservice.c b/gio/gthreadedsocketservice.c index 57ca737eb..83b75fe71 100644 --- a/gio/gthreadedsocketservice.c +++ b/gio/gthreadedsocketservice.c @@ -52,7 +52,6 @@ #include "gio-marshal.h" -#include "gioalias.h" static guint g_threaded_socket_service_run_signal; @@ -273,6 +272,3 @@ g_threaded_socket_service_new (int max_threads) "max-threads", max_threads, NULL); } - -#define __G_THREADED_SOCKET_SERVICE_C__ -#include "gioaliasdef.c" diff --git a/gio/gunionvolumemonitor.c b/gio/gunionvolumemonitor.c index a0a3634cf..1b681f96d 100644 --- a/gio/gunionvolumemonitor.c +++ b/gio/gunionvolumemonitor.c @@ -38,7 +38,6 @@ #include "glibintl.h" -#include "gioalias.h" struct _GUnionVolumeMonitor { GVolumeMonitor parent; @@ -689,7 +688,3 @@ g_volume_monitor_adopt_orphan_mount (GMount *mount) return volume; } - - -#define __G_UNION_VOLUME_MONITOR_C__ -#include "gioaliasdef.c" diff --git a/gio/gunixconnection.c b/gio/gunixconnection.c index 574b368fc..7626c1fcf 100644 --- a/gio/gunixconnection.c +++ b/gio/gunixconnection.c @@ -50,7 +50,6 @@ #include <string.h> #endif -#include "gioalias.h" G_DEFINE_TYPE_WITH_CODE (GUnixConnection, g_unix_connection, G_TYPE_SOCKET_CONNECTION, @@ -548,6 +547,3 @@ g_unix_connection_receive_credentials (GUnixConnection *connection, g_object_unref (socket); return ret; } - -#define __G_UNIX_CONNECTION_C__ -#include "gioaliasdef.c" diff --git a/gio/gunixcredentialsmessage.c b/gio/gunixcredentialsmessage.c index bb4ef0034..12b249035 100644 --- a/gio/gunixcredentialsmessage.c +++ b/gio/gunixcredentialsmessage.c @@ -57,7 +57,6 @@ #include "gcredentials.h" #include "glibintl.h" -#include "gioalias.h" struct _GUnixCredentialsMessagePrivate { @@ -339,7 +338,3 @@ g_unix_credentials_message_get_credentials (GUnixCredentialsMessage *message) g_return_val_if_fail (G_IS_UNIX_CREDENTIALS_MESSAGE (message), NULL); return message->priv->credentials; } - - -#define __G_UNIX_CREDENTIALS_MESSAGE_C__ -#include "gioaliasdef.c" diff --git a/gio/gunixfdlist.c b/gio/gunixfdlist.c index d9d48f82e..e9425db96 100644 --- a/gio/gunixfdlist.c +++ b/gio/gunixfdlist.c @@ -45,7 +45,6 @@ #include "gunixfdlist.h" #include "gioerror.h" -#include "gioalias.h" G_DEFINE_TYPE (GUnixFDList, g_unix_fd_list, G_TYPE_OBJECT) @@ -396,6 +395,3 @@ g_unix_fd_list_get_length (GUnixFDList *list) return list->priv->nfd; } - -#define __G_UNIX_FD_LIST_C__ -#include "gioaliasdef.c" diff --git a/gio/gunixfdmessage.c b/gio/gunixfdmessage.c index 9d3fa442c..766a4e20a 100644 --- a/gio/gunixfdmessage.c +++ b/gio/gunixfdmessage.c @@ -47,7 +47,6 @@ #include "gunixfdlist.h" #include "gioerror.h" -#include "gioalias.h" G_DEFINE_TYPE (GUnixFDMessage, g_unix_fd_message, @@ -319,6 +318,3 @@ g_unix_fd_message_append_fd (GUnixFDMessage *message, return g_unix_fd_list_append (message->priv->list, fd, error) > 0; } - -#define __G_UNIX_FD_MESSAGE_C__ -#include "gioaliasdef.c" diff --git a/gio/gunixinputstream.c b/gio/gunixinputstream.c index 669128aea..2cd9aa48e 100644 --- a/gio/gunixinputstream.c +++ b/gio/gunixinputstream.c @@ -38,7 +38,6 @@ #include "gasynchelper.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gunixinputstream @@ -643,6 +642,3 @@ g_unix_input_stream_close_finish (GInputStream *stream, /* Failures handled in generic close_finish code */ return TRUE; } - -#define __G_UNIX_INPUT_STREAM_C__ -#include "gioaliasdef.c" diff --git a/gio/gunixmount.c b/gio/gunixmount.c index c475ff989..c030a0453 100644 --- a/gio/gunixmount.c +++ b/gio/gunixmount.c @@ -45,7 +45,6 @@ /* for BUFSIZ */ #include <stdio.h> -#include "gioalias.h" struct _GUnixMount { GObject parent; diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c index 4c5ed6c73..bca3dcaa1 100644 --- a/gio/gunixmounts.c +++ b/gio/gunixmounts.c @@ -56,7 +56,6 @@ #include "glibintl.h" #include "gthemedicon.h" -#include "gioalias.h" static const char *_resolve_dev_root (void); @@ -2191,6 +2190,3 @@ found: return real_dev_root; } #endif - -#define __G_UNIX_MOUNTS_C__ -#include "gioaliasdef.c" diff --git a/gio/gunixoutputstream.c b/gio/gunixoutputstream.c index 59615a5da..16315ca61 100644 --- a/gio/gunixoutputstream.c +++ b/gio/gunixoutputstream.c @@ -38,7 +38,6 @@ #include "gasynchelper.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gunixoutputstream @@ -599,6 +598,3 @@ g_unix_output_stream_close_finish (GOutputStream *stream, /* Failures handled in generic close_finish code */ return TRUE; } - -#define __G_UNIX_OUTPUT_STREAM_C__ -#include "gioaliasdef.c" diff --git a/gio/gunixresolver.c b/gio/gunixresolver.c index 2155c661f..d60fcf76f 100644 --- a/gio/gunixresolver.c +++ b/gio/gunixresolver.c @@ -34,7 +34,6 @@ #include "gsimpleasyncresult.h" #include "gsocketaddress.h" -#include "gioalias.h" G_DEFINE_TYPE (GUnixResolver, g_unix_resolver, G_TYPE_THREADED_RESOLVER) @@ -522,6 +521,3 @@ g_unix_resolver_class_init (GUnixResolverClass *unix_class) object_class->finalize = g_unix_resolver_finalize; } - -#define __G_UNIX_RESOLVER_C__ -#include "gioaliasdef.c" diff --git a/gio/gunixsocketaddress.c b/gio/gunixsocketaddress.c index 6319be352..a1e06b143 100644 --- a/gio/gunixsocketaddress.c +++ b/gio/gunixsocketaddress.c @@ -29,7 +29,6 @@ #include "glibintl.h" #include "gnetworkingprivate.h" -#include "gioalias.h" /** * SECTION:gunixsocketaddress @@ -526,6 +525,3 @@ g_unix_socket_address_abstract_names_supported (void) return FALSE; #endif } - -#define __G_UNIX_SOCKET_ADDRESS_C__ -#include "gioaliasdef.c" diff --git a/gio/gunixvolume.c b/gio/gunixvolume.c index 28c4f2ed6..3cf6094b0 100644 --- a/gio/gunixvolume.c +++ b/gio/gunixvolume.c @@ -42,7 +42,6 @@ /* for BUFSIZ */ #include <stdio.h> -#include "gioalias.h" struct _GUnixVolume { GObject parent; diff --git a/gio/gunixvolumemonitor.c b/gio/gunixvolumemonitor.c index b44e614a8..76a984035 100644 --- a/gio/gunixvolumemonitor.c +++ b/gio/gunixvolumemonitor.c @@ -37,7 +37,6 @@ #include "giomodule.h" #include "glibintl.h" -#include "gioalias.h" struct _GUnixVolumeMonitor { GNativeVolumeMonitor parent; diff --git a/gio/gvfs.c b/gio/gvfs.c index df59c62d5..d439c161e 100644 --- a/gio/gvfs.c +++ b/gio/gvfs.c @@ -27,7 +27,6 @@ #include "giomodule-priv.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gvfs @@ -250,6 +249,3 @@ g_vfs_get_local (void) return G_VFS (vfs); } - -#define __G_VFS_C__ -#include "gioaliasdef.c" diff --git a/gio/gvolume.c b/gio/gvolume.c index 3768b6905..4046eb47a 100644 --- a/gio/gvolume.c +++ b/gio/gvolume.c @@ -29,7 +29,6 @@ #include "gioerror.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gvolume @@ -638,8 +637,3 @@ g_volume_get_activation_root (GVolume *volume) return (* iface->get_activation_root) (volume); } - - - -#define __G_VOLUME_C__ -#include "gioaliasdef.c" diff --git a/gio/gvolumemonitor.c b/gio/gvolumemonitor.c index ec00d5afa..5fbe4c0b8 100644 --- a/gio/gvolumemonitor.c +++ b/gio/gvolumemonitor.c @@ -30,7 +30,6 @@ #include "gdrive.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gvolumemonitor @@ -390,7 +389,3 @@ g_volume_monitor_get_mount_for_uuid (GVolumeMonitor *volume_monitor, return class->get_mount_for_uuid (volume_monitor, uuid); } - - -#define __G_VOLUME_MONITOR_C__ -#include "gioaliasdef.c" diff --git a/gio/gwin32appinfo.c b/gio/gwin32appinfo.c index 3e669c673..8095298bd 100644 --- a/gio/gwin32appinfo.c +++ b/gio/gwin32appinfo.c @@ -35,7 +35,6 @@ #include <windows.h> #include <shlwapi.h> -#include "gioalias.h" #ifndef ASSOCF_INIT_BYEXENAME #define ASSOCF_INIT_BYEXENAME 0x00000002 diff --git a/gio/gwin32inputstream.c b/gio/gwin32inputstream.c index 3cfe5cc42..a545981b3 100644 --- a/gio/gwin32inputstream.c +++ b/gio/gwin32inputstream.c @@ -35,7 +35,6 @@ #include "gasynchelper.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gwin32inputstream @@ -354,6 +353,3 @@ g_win32_input_stream_close (GInputStream *stream, return TRUE; } - -#define __G_WIN32_INPUT_STREAM_C__ -#include "gioaliasdef.c" diff --git a/gio/gwin32mount.c b/gio/gwin32mount.c index d7659dc20..b40412f2c 100644 --- a/gio/gwin32mount.c +++ b/gio/gwin32mount.c @@ -40,7 +40,6 @@ #include "gsimpleasyncresult.h" #include "glibintl.h" -#include "gioalias.h" struct _GWin32Mount { GObject parent; diff --git a/gio/gwin32outputstream.c b/gio/gwin32outputstream.c index 7b9f03bd3..609e4f423 100644 --- a/gio/gwin32outputstream.c +++ b/gio/gwin32outputstream.c @@ -36,7 +36,6 @@ #include "gasynchelper.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gwin32outputstream @@ -354,6 +353,3 @@ g_win32_output_stream_close (GOutputStream *stream, return TRUE; } - -#define __G_WIN32_OUTPUT_STREAM_C__ -#include "gioaliasdef.c" diff --git a/gio/gwin32resolver.c b/gio/gwin32resolver.c index 5198b955d..1dd2aad9b 100644 --- a/gio/gwin32resolver.c +++ b/gio/gwin32resolver.c @@ -34,7 +34,6 @@ #include "gsimpleasyncresult.h" #include "gsocketaddress.h" -#include "gioalias.h" G_DEFINE_TYPE (GWin32Resolver, g_win32_resolver, G_TYPE_THREADED_RESOLVER) @@ -482,6 +481,3 @@ g_win32_handle_source_add (HANDLE handle, g_source_attach (source, g_main_context_get_thread_default ()); return source; } - -#define __G_WIN32_RESOLVER_C__ -#include "gioaliasdef.c" diff --git a/gio/gwin32volumemonitor.c b/gio/gwin32volumemonitor.c index 88cdecebb..4b984ea57 100644 --- a/gio/gwin32volumemonitor.c +++ b/gio/gwin32volumemonitor.c @@ -34,7 +34,6 @@ #include "gwin32mount.h" #include "gmount.h" #include "giomodule.h" -#include "gioalias.h" #define _WIN32_WINNT 0x0500 #include <windows.h> diff --git a/gio/gzlibcompressor.c b/gio/gzlibcompressor.c index b7cff7d23..fc6f33e2f 100644 --- a/gio/gzlibcompressor.c +++ b/gio/gzlibcompressor.c @@ -33,7 +33,6 @@ #include "gioenumtypes.h" #include "glibintl.h" -#include "gioalias.h" enum { PROP_0, @@ -319,6 +318,3 @@ g_zlib_compressor_iface_init (GConverterIface *iface) iface->convert = g_zlib_compressor_convert; iface->reset = g_zlib_compressor_reset; } - -#define __G_ZLIB_COMPRESSOR_C__ -#include "gioaliasdef.c" diff --git a/gio/gzlibdecompressor.c b/gio/gzlibdecompressor.c index a8e852ff0..7eeee79ed 100644 --- a/gio/gzlibdecompressor.c +++ b/gio/gzlibdecompressor.c @@ -33,7 +33,6 @@ #include "gioenumtypes.h" #include "glibintl.h" -#include "gioalias.h" enum { PROP_0, @@ -291,6 +290,3 @@ g_zlib_decompressor_iface_init (GConverterIface *iface) iface->convert = g_zlib_decompressor_convert; iface->reset = g_zlib_decompressor_reset; } - -#define __G_ZLIB_DECOMPRESSOR_C__ -#include "gioaliasdef.c" diff --git a/gio/inotify/ginotifydirectorymonitor.c b/gio/inotify/ginotifydirectorymonitor.c index dcc97a0d0..45bc57933 100644 --- a/gio/inotify/ginotifydirectorymonitor.c +++ b/gio/inotify/ginotifydirectorymonitor.c @@ -31,8 +31,6 @@ #define USE_INOTIFY 1 #include "inotify-helper.h" -#include "gioalias.h" - struct _GInotifyDirectoryMonitor { GLocalDirectoryMonitor parent_instance; @@ -156,4 +154,3 @@ g_inotify_directory_monitor_cancel (GFileMonitor* monitor) return TRUE; } - diff --git a/gio/inotify/ginotifyfilemonitor.c b/gio/inotify/ginotifyfilemonitor.c index f87f07943..bdfea194e 100644 --- a/gio/inotify/ginotifyfilemonitor.c +++ b/gio/inotify/ginotifyfilemonitor.c @@ -31,8 +31,6 @@ #define USE_INOTIFY 1 #include "inotify-helper.h" -#include "gioalias.h" - struct _GInotifyFileMonitor { GLocalFileMonitor parent_instance; @@ -178,4 +176,3 @@ g_inotify_file_monitor_cancel (GFileMonitor* monitor) return TRUE; } - diff --git a/gio/inotify/inotify-helper.c b/gio/inotify/inotify-helper.c index 6d3b2489b..de44fdb72 100644 --- a/gio/inotify/inotify-helper.c +++ b/gio/inotify/inotify-helper.c @@ -38,9 +38,6 @@ #include "inotify-path.h" #include "inotify-diag.h" -#include "gioalias.h" - - static gboolean ih_debug_enabled = FALSE; #define IH_W if (ih_debug_enabled) g_warning diff --git a/gio/makefile.msc b/gio/makefile.msc index 57656c518..c54557848 100644 --- a/gio/makefile.msc +++ b/gio/makefile.msc @@ -221,8 +221,6 @@ local_sources = \ all : \ $(PRJ_TOP)\config.h \ sub-all \ - gioalias.h \ - gioaliasdef.c \ gio-marshal.c \ gioenumtypes.h \ gioenumtypes.c \ @@ -232,12 +230,6 @@ all : \ $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h -gioalias.h: gio.symbols - perl ..\glib\makegalias.pl < gio.symbols > gioalias.h - -gioaliasdef.c: gio.symbols - perl ..\glib\makegalias.pl -def < gio.symbols > gioaliasdef.c - gioenumtypes.h: $(gio_headers) gioenumtypes.h.template $(PERL) ..\gobject\glib-mkenums --template gioenumtypes.h.template $(gio_headers) > gioenumtypes.h diff --git a/gio/makegioalias.pl b/gio/makegioalias.pl deleted file mode 100755 index 84f9c3c66..000000000 --- a/gio/makegioalias.pl +++ /dev/null @@ -1,139 +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 makegioalias.pl */ - -#ifndef DISABLE_VISIBILITY - -#include "glib.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/) - { - print $_; - - next; - } - - if ($_ =~ /^\#if.*(IN_FILE|IN_HEADER)/) - { - 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/gio/pltcheck.sh b/gio/pltcheck.sh deleted file mode 100755 index f655ceeac..000000000 --- a/gio/pltcheck.sh +++ /dev/null @@ -1,21 +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 - -SKIP='\<g_access\|\<g_array_\|\<g_ascii\|\<g_list_\|\<g_assertion_message\|\<g_warn_message\|\<g_atomic\|\<g_bit_\|\<g_boxed\|\<g_build_filename\|\<g_byte_array\|\<g_checksum\|\<g_child_watch\|\<g_clear_error\|\<g_convert\|\<g_dir_\|\<g_enum_\|\<g_error_\|\<g_prefix_error\|\<g_file_error_quark\|\<g_file_get_contents\|\<g_file_set_contents\|\<g_file_test\|\<g_file_read_link\|\<g_filename_\|\<g_find_program_in_path\|\<g_flags_\|\<g_free\|\<g_get_\|\<g_getenv\|\<g_setenv\|\<g_hash_table_\|\<g_hostname_\|\<g_iconv\|\<g_idle_\|\<g_intern_static_string\|\<g_io_add_watch\|\<g_io_channel_\|\<g_io_create_watch\|\<g_key_file_\|\<g_listenv\|\<g_locale_to_utf8\|\<g_log\|\<g_main_context_\|\<g_main_current_source\|\<g_main_loop_\|\<g_malloc\|\<g_markup_\|\<g_mkdir_\|\<g_mkstemp\|\<g_module_\|\<g_object_\|\<g_once_\|\<g_param_spec_\|\<g_path_\|\<g_poll\|\<g_printerr\|\<g_propagate_error\|\<g_ptr_array_\|\<g_qsort_\|\<g_quark_\|\<g_queue_\|\<g_random_int_range\|\<g_realloc\|\<g_return_if_fail\|\<g_set_error\|\<g_shell_\|\<g_signal_\|\<g_slice_\|\<g_slist_\|\<g_snprintf\|\<g_source_\|\<g_spawn_\|\<g_static_\|\<g_str\|\<g_thread_pool_\|\<g_time_val_add\|\<g_timeout_\|\<g_type_\|\<g_unlink\|\<g_uri_\|\<g_utf8_\|\<g_value_\|\<g_tree_\|\<g_variant_\|\<g_mapped_file_\|\<g_intern_string\>\|\<g_compute_checksum\|\<g_memdup\|\<g_print\|\<g_random_int\|\<g_propagate_prefixed_e\|\<g_thread_create_full\|\<g_int_hash\|\<g_file_open_tmp\|\<g_thread_self\|\<g_usleep\|\<g_dcgettext\|\<g_dgettext\|\<g_closure' - -for so in .libs/lib*.so; do - echo Checking $so for local PLT entries - readelf -r $so | grep 'JU\?MP_SLOT\?' | grep '\<g_' | grep -v $SKIP && status=1 -done - -exit $status diff --git a/gio/win32/gwinhttpfile.c b/gio/win32/gwinhttpfile.c index 5f2d6bead..b3f8d63f8 100644 --- a/gio/win32/gwinhttpfile.c +++ b/gio/win32/gwinhttpfile.c @@ -38,8 +38,6 @@ #include "glibintl.h" -#include "gioalias.h" - static void g_winhttp_file_file_iface_init (GFileIface *iface); #define g_winhttp_file_get_type _g_winhttp_file_get_type diff --git a/gio/win32/gwinhttpfileinputstream.c b/gio/win32/gwinhttpfileinputstream.c index 3bd361e1a..fb56bd74a 100644 --- a/gio/win32/gwinhttpfileinputstream.c +++ b/gio/win32/gwinhttpfileinputstream.c @@ -31,8 +31,6 @@ #include "gwinhttpfileinputstream.h" #include "glibintl.h" -#include "gioalias.h" - struct _GWinHttpFileInputStream { GFileInputStream parent_instance; diff --git a/gio/win32/gwinhttpfileoutputstream.c b/gio/win32/gwinhttpfileoutputstream.c index 586a2a627..1339fc7db 100644 --- a/gio/win32/gwinhttpfileoutputstream.c +++ b/gio/win32/gwinhttpfileoutputstream.c @@ -31,8 +31,6 @@ #include "gwinhttpfileoutputstream.h" #include "glibintl.h" -#include "gioalias.h" - struct _GWinHttpFileOutputStream { GFileOutputStream parent_instance; diff --git a/gio/win32/gwinhttpvfs.c b/gio/win32/gwinhttpvfs.c index 494f53f08..c2833ba85 100644 --- a/gio/win32/gwinhttpvfs.c +++ b/gio/win32/gwinhttpvfs.c @@ -33,8 +33,6 @@ #include "gwinhttpfile.h" #include "gwinhttpvfs.h" -#include "gioalias.h" - static gboolean lookup_done = FALSE; static gboolean funcs_found = FALSE; static GWinHttpDllFuncs funcs; |