Fix make check

diff --git a/gio/ginetsocketaddress.c b/gio/ginetsocketaddress.c
index fac98150f6a710139bf599b0eab69ec09f127957..b57ff68e1d50eefb3c3c7abfe1de904a5c172aa8 100644 (file)
--- a/gio/ginetsocketaddress.c
+++ b/gio/ginetsocketaddress.c
@@ -35,7 +35,7 @@
 
 /**
  * SECTION:ginetsocketaddress
- * @short_description: Internet #GSocketAddress
+ * @short_description: Internet GSocketAddress
  *
  * An IPv4 or IPv6 socket address; that is, the combination of a
  * #GInetAddress and a port number.

diff --git a/gio/gnetworkaddress.c b/gio/gnetworkaddress.c
index 72209c4f55c0a1d39728e12d886a60689b149763..3e09db0d2cc87ca24e0f39eb2f5277020c93d222 100644 (file)
--- a/gio/gnetworkaddress.c
+++ b/gio/gnetworkaddress.c
@@ -48,7 +48,7 @@
 
 /**
  * SECTION:gnetworkaddress
- * @short_description: a #GSocketConnectable for resolving hostnames
+ * @short_description: A GSocketConnectable for resolving hostnames
  * @include: gio/gio.h
  *
  * #GNetworkAddress provides an easy way to resolve a hostname and

diff --git a/gio/gnetworkservice.c b/gio/gnetworkservice.c
index 42a244b03f313655dc7651b2c37f9838d6714a48..31bbf6a5c5bdb5c2efe2d3e6b3ae7c272d237185 100644 (file)
--- a/gio/gnetworkservice.c
+++ b/gio/gnetworkservice.c
@@ -41,7 +41,7 @@
 
 /**
  * SECTION:gnetworkservice
- * @short_description: a #GSocketConnectable for resolving SRV records
+ * @short_description: A GSocketConnectable for resolving SRV records
  * @include: gio/gio.h
  *
  * Like #GNetworkAddress does with hostnames, #GNetworkService

diff --git a/gio/gsocketconnectable.c b/gio/gsocketconnectable.c
index b02d3ccd468444a73087477bf594ede560a1825c..a57a00197ba3199ba8d988c680433f99ab7e1b79 100644 (file)
--- a/gio/gsocketconnectable.c
+++ b/gio/gsocketconnectable.c
@@ -26,7 +26,7 @@
 
 /**
  * SECTION:gsocketconnectable
- * @short_description: Interface for potential socket endpoints.
+ * @short_description: Interface for potential socket endpoints
  *
  * Objects that describe one or more potential socket endpoints
  * implement #GSocketConnectable. Callers can then use

diff --git a/gio/gsocketcontrolmessage.c b/gio/gsocketcontrolmessage.c
index 6810f5c6653344fe0293883eb3d111ded9c66904..7af3990922e1dd3f312a81c7edcdbb58d3818a38 100644 (file)
--- a/gio/gsocketcontrolmessage.c
+++ b/gio/gsocketcontrolmessage.c
@@ -15,7 +15,7 @@
 /**
  * SECTION: gsocketcontrolmessage
  * @title: GSocketControlMessage
- * @short_description: a #GSocket control message
+ * @short_description: A GSocket control message
  * @see_also: #GSocket.
  *
  * A #GSocketControlMessage is a special-purpose utility message that

diff --git a/gio/gsocketinputstream.c b/gio/gsocketinputstream.c
index e24ef02f2f9edbae5927a32ff70ea7184a8732ea..6c0c68a4aa57f3a6002b55dd00de62b144d3f68e 100644 (file)
--- a/gio/gsocketinputstream.c
+++ b/gio/gsocketinputstream.c
@@ -30,6 +30,8 @@
 #include <gio/gsimpleasyncresult.h>
 #include <gio/gcancellable.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);
 
@@ -257,3 +259,6 @@ _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/gsocketoutputstream.c b/gio/gsocketoutputstream.c
index 0e53a5788e82b394e6ab66d9708dd2b6fb7fc0ba..98d5c474e4cd78e020e49fce72844014d1e6f7ba 100644 (file)
--- a/gio/gsocketoutputstream.c
+++ b/gio/gsocketoutputstream.c
@@ -24,12 +24,16 @@
  */
 
 #include "config.h"
+#include "goutputstream.h"
 #include "gsocketoutputstream.h"
+#include "gsocket.h"
 
 #include <gio/gsimpleasyncresult.h>
 #include <gio/gcancellable.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);
 
@@ -257,3 +261,6 @@ _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/gthreadedsocketservice.c b/gio/gthreadedsocketservice.c
index eb955acfff36687be3576cc5b3f718eac61c7ba1..eccb216d62a69d352a04f309140cfb8adbdaa605 100644 (file)
--- a/gio/gthreadedsocketservice.c
+++ b/gio/gthreadedsocketservice.c
@@ -25,7 +25,7 @@
 /**
  * SECTION: gthreadedsocketservice
  * @title: GThreadedSocketService
- * @short_description: a threaded #GSocketService
+ * @short_description: A threaded GSocketService
  * @see_also: #GSocketService.
  *
  * A #GThreadedSocketService is a simple subclass of #GSocketService

diff --git a/gio/gunixfdmessage.c b/gio/gunixfdmessage.c
index bcf3d0bbec39fa680ec65931382d897df13054e9..6692e70b3615261fca93bf584745588455f0ae3a 100644 (file)
--- a/gio/gunixfdmessage.c
+++ b/gio/gunixfdmessage.c
@@ -15,7 +15,7 @@
 /**
  * SECTION: gunixfdmessage
  * @title: GUnixFDMessage
- * @short_description: a #GSocketControlMessage containing a list of
+ * @short_description: A GSocketControlMessage containing a list of
  * file descriptors
  * @see_also: #GUnixConnection
  *

diff --git a/gio/gunixsocketaddress.c b/gio/gunixsocketaddress.c
index b70ca77ebc52c22e271c6ddb0d64070934cf2cea..43c4920ccd662c74ba7ce5858b2210bb4efe91f9 100644 (file)
--- a/gio/gunixsocketaddress.c
+++ b/gio/gunixsocketaddress.c
@@ -35,7 +35,7 @@
 
 /**
  * SECTION:gunixsocketaddress
- * @short_description: Unix #GSocketAddress
+ * @short_description: UNIX GSocketAddress
  *
  * Support for UNIX-domain (aka local) sockets.
  */

diff --git a/gio/pltcheck.sh b/gio/pltcheck.sh
index be29be806d2fc2a64ca3ec1a0aab7210887621f8..583dd02feb514979c3d9016849214e8a9cfff8dc 100755 (executable)
--- a/gio/pltcheck.sh
+++ b/gio/pltcheck.sh
@@ -9,7 +9,7 @@ if ! which readelf 2>/dev/null >/dev/null; then
        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_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_hash_table_\|\<g_hostname_\|\<g_idle_\|\<g_intern_static_string\|\<g_io_add_watch\|\<g_io_channel_\|\<g_key_file_\|\<g_listenv\|\<g_locale_to_utf8\|\<g_log\|\<g_main_context_wakeup\|\<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_'
+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_hash_table_\|\<g_hostname_\|\<g_idle_\|\<g_intern_static_string\|\<g_io_add_watch\|\<g_io_channel_\|\<g_key_file_\|\<g_listenv\|\<g_locale_to_utf8\|\<g_log\|\<g_main_context_\|\<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_'
 
 for so in .libs/lib*.so; do
        echo Checking $so for local PLT entries