Changeset 2e12226 in mod_gnutls for include


Ignore:
Timestamp:
Sep 27, 2004, 4:00:52 PM (14 years ago)
Author:
Paul Querna <chip@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, msva, 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:
1 edited

Legend:

Unmodified
Added
Removed
  • include/mod_gnutls.h

    r7e2b223 r2e12226  
    4141
    4242
     43/**
     44 * GnuTLS changed the names of several structures between 1.0.X and 1.1.X
     45 * This is just a simple hack so we can compile with both versions.
     46 * There is a full list in <gnutls/compat.h>, But I am just
     47 * doing this for a few types we use.
     48 */
     49#ifndef gnutls_certificate_credentials_t
     50#define gnutls_certificate_credentials_t    gnutls_certificate_credentials
     51#define gnutls_anon_server_credentials_t    gnutls_anon_server_credentials
     52#define gnutls_session_t                    gnutls_session
     53#define gnutls_transport_ptr_t              gnutls_transport_ptr
     54#define gnutls_dh_params_t                  gnutls_dh_params
     55#define gnutls_rsa_params_t                 gnutls_rsa_params
     56#endif
     57
    4358typedef struct
    4459{
     
    5368    int protocol[16];
    5469    int compression[16];
    55 } gnutls_srvconf_rec;
     70} mod_gnutls_srvconf_rec;
    5671
    57 typedef struct gnutls_handle_t gnutls_handle_t;
    58 struct gnutls_handle_t
     72typedef struct
    5973{
    60     gnutls_srvconf_rec *sc;
     74    mod_gnutls_srvconf_rec *sc;
    6175    gnutls_session_t session;
    6276    ap_filter_t *input_filter;
     
    6579    int status;
    6680    int non_https;
    67 };
     81} mod_gnutls_handle_t;
    6882
    6983/** Functions in gnutls_io.c **/
     
    8094 */
    8195apr_status_t mod_gnutls_filter_input(ap_filter_t * f,
    82                                  apr_bucket_brigade * bb,
    83                                  ap_input_mode_t mode,
    84                                  apr_read_type_e block, apr_off_t readbytes);
     96                                     apr_bucket_brigade * bb,
     97                                     ap_input_mode_t mode,
     98                                     apr_read_type_e block,
     99                                     apr_off_t readbytes);
    85100
    86101/**
     
    92107 * @return result status
    93108 */
    94 apr_status_t mod_gnutls_filter_output(ap_filter_t * f, apr_bucket_brigade * bb);
     109apr_status_t mod_gnutls_filter_output(ap_filter_t * f,
     110                                      apr_bucket_brigade * bb);
    95111
    96112
     
    105121 */
    106122ssize_t mod_gnutls_transport_read(gnutls_transport_ptr_t ptr,
    107                                      void *buffer, size_t len);
     123                                  void *buffer, size_t len);
    108124
    109125/**
     
    117133 */
    118134ssize_t mod_gnutls_transport_write(gnutls_transport_ptr_t ptr,
    119                                       const void *buffer, size_t len);
     135                                   const void *buffer, size_t len);
    120136
    121137
Note: See TracChangeset for help on using the changeset viewer.