Remove NOPROTO-related macros.

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);

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;

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;
 	}

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;

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;

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 */