[or-cvs] r10598: Fix compilation on compilers that do not allow you to typede (in tor/trunk: . src/common)

[nickm at seul.org]

Author: nickm
Date: 2007-06-13 18:39:10 -0400 (Wed, 13 Jun 2007)
New Revision: 10598

Modified:
   tor/trunk/
   tor/trunk/src/common/crypto.h
Log:
 r13410 at catbus:  nickm | 2007-06-13 18:39:05 -0400
 Fix compilation on compilers that do not allow you to typedef the same type twice.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r13410] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/common/crypto.h
===================================================================
--- tor/trunk/src/common/crypto.h	2007-06-13 22:39:08 UTC (rev 10597)
+++ tor/trunk/src/common/crypto.h	2007-06-13 22:39:10 UTC (rev 10598)
@@ -176,12 +176,13 @@
 
 #ifdef CRYPTO_PRIVATE
 /* Prototypes for private functions only used by tortls.c and crypto.c */
-typedef struct rsa_st RSA;
-typedef struct evp_pkey_st EVP_PKEY;
-typedef struct dh_st DH;
-crypto_pk_env_t *_crypto_new_pk_env_rsa(RSA *rsa);
-EVP_PKEY *_crypto_pk_env_get_evp_pkey(crypto_pk_env_t *env, int private);
-DH *_crypto_dh_env_get_dh(crypto_dh_env_t *dh);
+struct rsa_st;
+struct evp_pkey_st;
+struct dh_st;
+crypto_pk_env_t *_crypto_new_pk_env_rsa(struct rsa_st *rsa);
+struct evp_pkey_st *_crypto_pk_env_get_evp_pkey(crypto_pk_env_t *env,
+                                                int private);
+struct dh_st *_crypto_dh_env_get_dh(crypto_dh_env_t *dh);
 /* Prototypes for private functions only used by crypto.c and test.c*/
 int crypto_pk_read_private_key_from_string(crypto_pk_env_t *env,
                                            const char *s);