As in 0.9.7 and on, let's remove the use of MS_FAR, and thereby the

need for e_os.h.

diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h
index 31e4005f3d2492ec11b1ee71347497d9584a43f0..3ae9803c1723d8fd2d4385c45db31d45971b379e 100644 (file)
--- a/crypto/conf/conf.h
+++ b/crypto/conf/conf.h
@@ -56,14 +56,13 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef  HEADER_CONF_H
+#ifndef HEADER_CONF_H
 #define HEADER_CONF_H
 
 #include <openssl/bio.h>
 #include <openssl/lhash.h>
 #include <openssl/stack.h>
 #include <openssl/safestack.h>
-#include <openssl/e_os.h>
 
 #ifdef  __cplusplus
 extern "C" {
@@ -86,14 +85,14 @@ 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)(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);
+       CONF *(*create)(CONF_METHOD *meth);
+       int (*init)(CONF *conf);
+       int (*destroy)(CONF *conf);
+       int (*destroy_data)(CONF *conf);
+       int (*load)(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 CONF_set_default_method(CONF_METHOD *meth);