summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2008-09-16 15:18:34 +0200
committerSimon Josefsson <simon@josefsson.org>2008-09-16 15:18:34 +0200
commita419d6f3375cf13455878dc5af00111cf92a44bb (patch)
tree0058b5912fcf7359bab232eabc9221a1f17cca0a
parentd77db82374b25ddd9cd7b35dfa3b3b2c2d51dbec (diff)
downloadgnutls-a419d6f3375cf13455878dc5af00111cf92a44bb.tar.gz
Don't use extern on functions, for consistency.
-rw-r--r--includes/gnutls/gnutls.h.in37
1 files changed, 17 insertions, 20 deletions
diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in
index c07ec21921..e029c67c91 100644
--- a/includes/gnutls/gnutls.h.in
+++ b/includes/gnutls/gnutls.h.in
@@ -749,13 +749,11 @@ extern "C"
gnutls_x509_crt_fmt_t type);
void gnutls_certificate_send_x509_rdn_sequence (gnutls_session_t session,
- int status);
-
+ int status);
- extern int
- gnutls_certificate_set_x509_simple_pkcs12_file
- (gnutls_certificate_credentials_t res, const char *pkcs12file,
- gnutls_x509_crt_fmt_t type, const char *password);
+ int gnutls_certificate_set_x509_simple_pkcs12_file
+ (gnutls_certificate_credentials_t res, const char *pkcs12file,
+ gnutls_x509_crt_fmt_t type, const char *password);
/* New functions to allow setting already parsed X.509 stuff.
*/
@@ -804,14 +802,13 @@ extern "C"
typedef void (*gnutls_free_function) (void *);
typedef void *(*gnutls_realloc_function) (void *, size_t);
- extern void
- gnutls_global_set_mem_functions (gnutls_alloc_function gt_alloc_func,
- gnutls_alloc_function
- gt_secure_alloc_func,
- gnutls_is_secure_function
- gt_is_secure_func,
- gnutls_realloc_function gt_realloc_func,
- gnutls_free_function gt_free_func);
+ void gnutls_global_set_mem_functions (gnutls_alloc_function gt_alloc_func,
+ gnutls_alloc_function
+ gt_secure_alloc_func,
+ gnutls_is_secure_function
+ gt_is_secure_func,
+ gnutls_realloc_function gt_realloc_func,
+ gnutls_free_function gt_free_func);
/* For use in callbacks */
extern gnutls_alloc_function gnutls_malloc;
@@ -946,12 +943,12 @@ extern "C"
const char *gnutls_srp_server_get_username (gnutls_session_t session);
- extern int gnutls_srp_verifier (const char *username,
- const char *password,
- const gnutls_datum_t * salt,
- const gnutls_datum_t * generator,
- const gnutls_datum_t * prime,
- gnutls_datum_t * res);
+ int gnutls_srp_verifier (const char *username,
+ const char *password,
+ const gnutls_datum_t * salt,
+ const gnutls_datum_t * generator,
+ const gnutls_datum_t * prime,
+ gnutls_datum_t * res);
/* The static parameters defined in draft-ietf-tls-srp-05
* Those should be used as input to gnutls_srp_verifier().