Commit 5b946e05 authored by Allison Karlitskaya's avatar Allison Karlitskaya

gio/: fully remove gioalias hacks

parent 0fc50fa5
......@@ -2,8 +2,6 @@ gschema-compile
gio-querymodules
gio-marshal.[ch]
gioenumtypes.[ch]
gioalias.h
gioaliasdef.c
glib-compile-schemas
gdbus
gsettings
......@@ -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)
......
......@@ -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));
}
......@@ -194,4 +194,3 @@ fen_init ()
G_UNLOCK (fen_lock);
return result;
}
......@@ -554,4 +554,3 @@ _event_string (int event)
return "EVENT_UNKNOWN";
}
}
......@@ -639,4 +639,3 @@ node_event_delete (node_event_t* ev)
{
g_free (ev);
}
......@@ -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;
}
......@@ -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;
}
......@@ -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"
......@@ -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"
......@@ -24,7 +24,6 @@
#include "gasynchelper.h"
#include "gioalias.h"
/**
* SECTION:gasynchelper
......
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
}
......@@ -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"
......@@ -417,4 +417,3 @@ _g_application_platform_remote_quit (GApplication *app,
if (result)
g_variant_unref (result);
}
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -26,7 +26,6 @@
#include <string.h>
#include "gioalias.h"
struct _GDelayedSettingsBackendPrivate
{
......
......@@ -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"
......@@ -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"
......@@ -35,7 +35,6 @@
#include "gdummyfile.h"
#include "gfile.h"
#include "gioalias.h"
static void g_dummy_file_file_iface_init (GFileIface *iface);
......
......@@ -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"
......@@ -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"
......@@ -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"
......@@ -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__