Remove NOPROTO-related macros.

diff --git a/crypto/asn1/x_crl.c b/crypto/asn1/x_crl.c
index 969134918b6139beb2cc18ff1b8eb6fa79316d5d..794e7a0eb13edd0d6cffc15f87dd3e05bd7de59f 100644 (file)
--- a/crypto/asn1/x_crl.c
+++ b/crypto/asn1/x_crl.c
@@ -102,7 +102,7 @@ int i2d_X509_CRL_INFO(X509_CRL_INFO *a, unsigned char **pp)
 
        if (sk_num(a->revoked) != 0)
                qsort((char *)a->revoked->data,sk_num(a->revoked),
-                       sizeof(X509_REVOKED *),(int (*)(P_CC_CC))X509_REVOKED_seq_cmp);
+                       sizeof(X509_REVOKED *),(int (*)(const void *,const void *))X509_REVOKED_seq_cmp);
        if ((a->version != NULL) && ((l=ASN1_INTEGER_get(a->version)) != 0))
                {
                M_ASN1_I2D_len(a->version,i2d_ASN1_INTEGER);

diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c
index e39febe36746ccee77e1ef950dac0ab79e0de9d4..28610766d0cde49a4b851bf7937b601c0c55db84 100644 (file)
--- a/crypto/bn/bn_prime.c
+++ b/crypto/bn/bn_prime.c
@@ -76,7 +76,7 @@ static int probable_prime_dh(BIGNUM *rnd, int bits,
 static int probable_prime_dh_strong(BIGNUM *rnd, int bits,
        BIGNUM *add, BIGNUM *rem, BN_CTX *ctx);
 BIGNUM *BN_generate_prime(BIGNUM *ret, int bits, int strong, BIGNUM *add,
-            BIGNUM *rem, void (*callback)(P_I_I_P), char *cb_arg)
+            BIGNUM *rem, void (*callback)(int,int,char *), char *cb_arg)
        {
        BIGNUM *rnd=NULL;
        BIGNUM t;
@@ -151,7 +151,7 @@ err:
        return(ret);
        }
 
-int BN_is_prime(BIGNUM *a, int checks, void (*callback)(P_I_I_P),
+int BN_is_prime(BIGNUM *a, int checks, void (*callback)(int,int,char *),
             BN_CTX *ctx_passed, char *cb_arg)
        {
        int i,j,c2=0,ret= -1;

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 2810d3b10b6afc926931764fc2b0975a4ffefc72..2a008729fb0c6fb0482824609cb9ee0be1e5342c 100644 (file)
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -151,12 +151,12 @@ void CRYPTO_set_add_lock_callback(int (*func)(int *num,int mount,int type,
        add_lock_callback=func;
        }
 
-unsigned long (*CRYPTO_get_id_callback(P_V))(P_V)
+unsigned long (*CRYPTO_get_id_callback(void))(void)
        {
        return(id_callback);
        }
 
-void CRYPTO_set_id_callback(func) unsigned long (*func)(P_V);
+void CRYPTO_set_id_callback(unsigned long (*func)(void))
        {
        id_callback=func;
        }

diff --git a/crypto/dh/dh_gen.c b/crypto/dh/dh_gen.c
index 32237e8b95e8d18d42734c03713dfdaa4a58692e..4d4aa69029b9a1e776c16b2d6489407036507097 100644 (file)
--- a/crypto/dh/dh_gen.c
+++ b/crypto/dh/dh_gen.c
@@ -84,7 +84,7 @@
  */
 
 DH *DH_generate_parameters(int prime_len, int generator,
-            void (*callback)(P_I_I_P), char *cb_arg)
+            void (*callback)(int,int,char *), char *cb_arg)
        {
        BIGNUM *p=NULL,*t1,*t2;
        DH *ret=NULL;

diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c
index f5d7ad25587204439f9fd5c2b196b2a6d8a2bff6..8f3279eee1d73c6b3ca3b15f963dfa38317909ae 100644 (file)
--- a/crypto/rsa/rsa_gen.c
+++ b/crypto/rsa/rsa_gen.c
@@ -63,7 +63,7 @@
 #include <openssl/rsa.h>
 
 RSA *RSA_generate_key(int bits, unsigned long e_value,
-            void (*callback)(P_I_I_P), char *cb_arg)
+            void (*callback)(int,int,char *), char *cb_arg)
        {
        RSA *rsa=NULL;
        BIGNUM *r0=NULL,*r1=NULL,*r2=NULL,*r3=NULL,*tmp;

diff --git a/e_os.h b/e_os.h
index c615c14a822af7b7c7cb8f7e12aea01b2147d035..bc42c4491b298658f946d8b66d708f68f1255ab5 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -276,16 +276,6 @@ extern HINSTANCE _hInstance;
 
 /***********************************************/
 
-#define P_CC_CC        const void *,const void *
-#define P_I_I          int,int 
-#define P_I_I_P                int,int,char *
-#define P_I_I_P_I      int,int,char *,int
-#define P_IP_I_I_P_I   int *,int,int,char *,int
-#define P_V            void 
-/* not used yet */
-#define        CS_BEGIN
-#define CS_END
-
 /* do we need to do this for getenv.
  * Just define getenv for use under windows */