[glib-networking/mcatanzaro/base-rebase: 26/40] gtlsconnection-openssl: use G_DECLARE_DERIVABLE_TYPE
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking/mcatanzaro/base-rebase: 26/40] gtlsconnection-openssl: use G_DECLARE_DERIVABLE_TYPE
- Date: Wed, 8 May 2019 22:12:25 +0000 (UTC)
commit 01c629b94c1e20a7549e8bcbb756f3aa0337dd66
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Sun Apr 7 15:23:22 2019 -0500
gtlsconnection-openssl: use G_DECLARE_DERIVABLE_TYPE
tls/openssl/gtlsconnection-openssl.h | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
---
diff --git a/tls/openssl/gtlsconnection-openssl.h b/tls/openssl/gtlsconnection-openssl.h
index 08ee313..d332b40 100644
--- a/tls/openssl/gtlsconnection-openssl.h
+++ b/tls/openssl/gtlsconnection-openssl.h
@@ -34,14 +34,8 @@
G_BEGIN_DECLS
#define G_TYPE_TLS_CONNECTION_OPENSSL (g_tls_connection_openssl_get_type ())
-#define G_TLS_CONNECTION_OPENSSL(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst),
G_TYPE_TLS_CONNECTION_OPENSSL, GTlsConnectionOpenssl))
-#define G_TLS_CONNECTION_OPENSSL_CLASS(class) (G_TYPE_CHECK_CLASS_CAST ((class),
G_TYPE_TLS_CONNECTION_OPENSSL, GTlsConnectionOpensslClass))
-#define G_IS_TLS_CONNECTION_OPENSSL(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst),
G_TYPE_TLS_CONNECTION_OPENSSL))
-#define G_IS_TLS_CONNECTION_OPENSSL_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class),
G_TYPE_TLS_CONNECTION_OPENSSL))
-#define G_TLS_CONNECTION_OPENSSL_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst),
G_TYPE_TLS_CONNECTION_OPENSSL, GTlsConnectionOpensslClass))
-typedef struct _GTlsConnectionOpensslClass GTlsConnectionOpensslClass;
-typedef struct _GTlsConnectionOpenssl GTlsConnectionOpenssl;
+G_DECLARE_DERIVABLE_TYPE (GTlsConnectionOpenssl, g_tls_connection_openssl, G, TLS_CONNECTION_OPENSSL,
GTlsConnectionBase)
struct _GTlsConnectionOpensslClass
{
@@ -50,13 +44,6 @@ struct _GTlsConnectionOpensslClass
SSL *(*get_ssl) (GTlsConnectionOpenssl *connection);
};
-struct _GTlsConnectionOpenssl
-{
- GTlsConnectionBase parent_instance;
-};
-
-GType g_tls_connection_openssl_get_type (void) G_GNUC_CONST;
-
SSL *g_tls_connection_openssl_get_ssl (GTlsConnectionOpenssl *connection);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]