Changeset 2e12226 in mod_gnutls for include/mod_gnutls.h

Timestamp:

Sep 27, 2004, 4:00:52 PM (18 years ago)

Author:

Paul Querna <chip@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, main, master, msva, proxy-ticket, upstream

Children:

dae0aec

Parents:

7e2b223

Message:

rename structures.
properly prefix all non-static functions with mod_gnutls_
fix build for GnuTLS 1.0.X. (redefine the changed structure names)

File:

• include/mod_gnutls.h (modified) (7 diffs)

include/mod_gnutls.h

@@ -41 +41 @@
 
 
+/**
+ * GnuTLS changed the names of several structures between 1.0.X and 1.1.X 
+ * This is just a simple hack so we can compile with both versions.
+ * There is a full list in <gnutls/compat.h>, But I am just 
+ * doing this for a few types we use.
+ */
+#ifndef gnutls_certificate_credentials_t
+#define gnutls_certificate_credentials_t    gnutls_certificate_credentials
+#define gnutls_anon_server_credentials_t    gnutls_anon_server_credentials
+#define gnutls_session_t                    gnutls_session
+#define gnutls_transport_ptr_t              gnutls_transport_ptr
+#define gnutls_dh_params_t                  gnutls_dh_params
+#define gnutls_rsa_params_t                 gnutls_rsa_params
+#endif
+
 typedef struct
 {
@@ -53 +68 @@
     int protocol[16];
     int compression[16];
-} gnutls_srvconf_rec;
+} mod_gnutls_srvconf_rec;
 
-typedef struct gnutls_handle_t gnutls_handle_t;
-struct gnutls_handle_t
+typedef struct
 {
-    gnutls_srvconf_rec *sc;
+    mod_gnutls_srvconf_rec *sc;
     gnutls_session_t session;
     ap_filter_t *input_filter;
@@ -65 +79 @@
     int status;
     int non_https;
-};
+} mod_gnutls_handle_t;
 
 /** Functions in gnutls_io.c **/
@@ -80 +94 @@
  */
 apr_status_t mod_gnutls_filter_input(ap_filter_t * f,
-                                 apr_bucket_brigade * bb,
-                                 ap_input_mode_t mode,
-                                 apr_read_type_e block, apr_off_t readbytes);
+                                     apr_bucket_brigade * bb,
+                                     ap_input_mode_t mode,
+                                     apr_read_type_e block,
+                                     apr_off_t readbytes);
 
 /**
@@ -92 +107 @@
  * @return result status
  */
-apr_status_t mod_gnutls_filter_output(ap_filter_t * f, apr_bucket_brigade * bb);
+apr_status_t mod_gnutls_filter_output(ap_filter_t * f,
+                                      apr_bucket_brigade * bb);
 
 
@@ -105 +121 @@
  */
 ssize_t mod_gnutls_transport_read(gnutls_transport_ptr_t ptr,
-                                     void *buffer, size_t len);
+                                  void *buffer, size_t len);
 
 /**
@@ -117 +133 @@
  */
 ssize_t mod_gnutls_transport_write(gnutls_transport_ptr_t ptr,
-                                      const void *buffer, size_t len);
+                                   const void *buffer, size_t len);