From: Richard Levitte <levitte@openssl.org>
Date: Thu, 22 Feb 2001 17:41:15 +0000 (+0000)
Subject: CONF_METHOD is one of the few places where you find MS_FAR.  I can't
X-Git-Tag: OpenSSL_0_9_6a-beta1~23^2~12
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4270144b3911da8cddc6908659ded2b2f9d00ac6;p=oweals%2Fopenssl.git

CONF_METHOD is one of the few places where you find MS_FAR.  I can't
really see why we need to define these function pointers with MS_FAR
if it's not done cosistently everywhere.

If we decide to support MS_FAR modifiers, it's better to have the
named something more unique for OpenSSL and to define them in e_os2.h.
---

diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h
index 655fe2a6f6..724378d07a 100644
--- a/crypto/conf/conf.h
+++ b/crypto/conf/conf.h
@@ -86,15 +86,15 @@ typedef struct conf_method_st CONF_METHOD;
 struct conf_method_st
 	{
 	const char *name;
-	CONF *(MS_FAR *create)(CONF_METHOD *meth);
-	int (MS_FAR *init)(CONF *conf);
-	int (MS_FAR *destroy)(CONF *conf);
-	int (MS_FAR *destroy_data)(CONF *conf);
-	int (MS_FAR *load_bio)(CONF *conf, BIO *bp, long *eline);
-	int (MS_FAR *dump)(CONF *conf, BIO *bp);
-	int (MS_FAR *is_number)(CONF *conf, char c);
-	int (MS_FAR *to_int)(CONF *conf, char c);
-	int (MS_FAR *load)(CONF *conf, const char *name, long *eline);
+	CONF *(*create)(CONF_METHOD *meth);
+	int (*init)(CONF *conf);
+	int (*destroy)(CONF *conf);
+	int (*destroy_data)(CONF *conf);
+	int (*load_bio)(CONF *conf, BIO *bp, long *eline);
+	int (*dump)(CONF *conf, BIO *bp);
+	int (*is_number)(CONF *conf, char c);
+	int (*to_int)(CONF *conf, char c);
+	int (*load)(CONF *conf, const char *name, long *eline);
 	};
 
 int CONF_set_default_method(CONF_METHOD *meth);