trivial linc patch to fix violation of strict glib inclusion policy
- From: Bill Haneman <bill haneman sun com>
- To: gnome-components-list gnome org
- Subject: trivial linc patch to fix violation of strict glib inclusion policy
- Date: Sun, 18 Nov 2001 05:45:58 +0000
Hi:
glib HEAD now forbids inclusion of glib header files other than
<glib-object.h>
The attached patch fixes the linc build, which breaks due to #error
enforcing of the policy above.
someone should probably commit it, or a better one (I am not sure if the
gmacros.h and gthread.h are still correct, but I think they are not
included by glib-object.h)
-Bill
? diff.linc
? docs/tmpl/linc-config.sgml
Index: docs/tmpl/linc-connection.sgml
===================================================================
RCS file: /cvs/gnome/linc/docs/tmpl/linc-connection.sgml,v
retrieving revision 1.2
diff -u -r1.2 linc-connection.sgml
--- docs/tmpl/linc-connection.sgml 2001/11/13 06:33:21 1.2
+++ docs/tmpl/linc-connection.sgml 2001/11/18 04:44:50
@@ -14,10 +14,12 @@
</para>
-<!-- ##### TYPEDEF LINCConnection ##### -->
+<!-- ##### MACRO LINC_IS_CONNECTION ##### -->
<para>
</para>
+
+ object:
<!-- ##### ENUM LINCConnectionStatus ##### -->
Index: docs/tmpl/linc-protocol.sgml
===================================================================
RCS file: /cvs/gnome/linc/docs/tmpl/linc-protocol.sgml,v
retrieving revision 1.2
diff -u -r1.2 linc-protocol.sgml
--- docs/tmpl/linc-protocol.sgml 2001/11/13 06:33:21 1.2
+++ docs/tmpl/linc-protocol.sgml 2001/11/18 04:44:50
@@ -31,26 +31,26 @@
@cnx_flags:
-<!-- ##### USER_FUNCTION LINCProtocolGetSockInfoFunc ##### -->
+<!-- ##### USER_FUNCTION LINCProtocolDestroyFunc ##### -->
<para>
</para>
- proto:
- sockaddr:
- hostname:
- service:
- Returns:
+ fd:
+ host_info:
+ serv_info:
-<!-- ##### USER_FUNCTION LINCProtocolDestroyFunc ##### -->
+<!-- ##### USER_FUNCTION LINCProtocolGetSockInfoFunc ##### -->
<para>
</para>
- fd:
- host_info:
- serv_info:
+ proto:
+ sockaddr:
+ hostname:
+ service:
+ Returns:
<!-- ##### STRUCT LINCProtocolInfo ##### -->
Index: docs/tmpl/linc-server.sgml
===================================================================
RCS file: /cvs/gnome/linc/docs/tmpl/linc-server.sgml,v
retrieving revision 1.2
diff -u -r1.2 linc-server.sgml
--- docs/tmpl/linc-server.sgml 2001/11/13 06:33:21 1.2
+++ docs/tmpl/linc-server.sgml 2001/11/18 04:44:50
@@ -14,10 +14,12 @@
</para>
-<!-- ##### TYPEDEF LINCServer ##### -->
+<!-- ##### MACRO LINC_IS_SERVER ##### -->
<para>
</para>
+
+ object:
<!-- ##### FUNCTION linc_server_setup ##### -->
Index: docs/tmpl/linc-types.sgml
===================================================================
RCS file: /cvs/gnome/linc/docs/tmpl/linc-types.sgml,v
retrieving revision 1.2
diff -u -r1.2 linc-types.sgml
--- docs/tmpl/linc-types.sgml 2001/11/13 06:33:21 1.2
+++ docs/tmpl/linc-types.sgml 2001/11/18 04:44:51
@@ -28,6 +28,21 @@
</para>
+<!-- ##### STRUCT LINCProtocolInfo ##### -->
+<para>
+
+</para>
+
+ name:
+ family:
+ addr_len:
+ stream_proto_num:
+ flags:
+ setup:
+ destroy:
+ get_sockaddr:
+ get_sockinfo:
+
<!-- ##### MACRO LINC_MUTEX_LOCK ##### -->
<para>
Locks the mutex pointed to by @x if the mutex is non NULL.
Index: docs/tmpl/linc-unused.sgml
===================================================================
RCS file: /cvs/gnome/linc/docs/tmpl/linc-unused.sgml,v
retrieving revision 1.3
diff -u -r1.3 linc-unused.sgml
--- docs/tmpl/linc-unused.sgml 2001/11/13 06:33:21 1.3
+++ docs/tmpl/linc-unused.sgml 2001/11/18 04:44:51
@@ -18,19 +18,17 @@
acconfig
-<!-- ##### MACRO LINC_IS_CONNECTION ##### -->
+<!-- ##### TYPEDEF LINCConnection ##### -->
<para>
</para>
- object:
-<!-- ##### MACRO LINC_IS_SERVER ##### -->
+<!-- ##### TYPEDEF LINCServer ##### -->
<para>
</para>
- object:
<!-- ##### FUNCTION gboolean ##### -->
<para>
Index: include/linc/linc-types.h
===================================================================
RCS file: /cvs/gnome/linc/include/linc/linc-types.h,v
retrieving revision 1.21
diff -u -r1.21 linc-types.h
--- include/linc/linc-types.h 2001/10/24 06:20:42 1.21
+++ include/linc/linc-types.h 2001/11/18 04:44:51
@@ -14,7 +14,7 @@
#include <glib/gmacros.h>
#include <glib/gthread.h>
-#include <gobject/gobject.h>
+#include <glib-object.h>
G_BEGIN_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]