Commit bfb863b8 authored by Richard Levitte's avatar Richard Levitte
Browse files

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

need for e_os.h.
parent f261295d

crypto/conf/conf.h

+9 −10
Original line number Original line Diff line number Diff line
@@ -63,7 +63,6 @@ 
#include <openssl/lhash.h>

#include <openssl/lhash.h>

#include <openssl/stack.h>

#include <openssl/stack.h>

#include <openssl/safestack.h>

#include <openssl/safestack.h>

#include <openssl/e_os.h>





#ifdef  __cplusplus

#ifdef  __cplusplus

extern "C" {

extern "C" {
@@ -86,14 +85,14 @@ typedef struct conf_method_st CONF_METHOD; 
struct conf_method_st

struct conf_method_st

	{

	{

	const char *name;

	const char *name;

	CONF *(MS_FAR *create)(CONF_METHOD *meth);

	CONF *(*create)(CONF_METHOD *meth);

	int (MS_FAR *init)(CONF *conf);

	int (*init)(CONF *conf);

	int (MS_FAR *destroy)(CONF *conf);

	int (*destroy)(CONF *conf);

	int (MS_FAR *destroy_data)(CONF *conf);

	int (*destroy_data)(CONF *conf);

	int (MS_FAR *load)(CONF *conf, BIO *bp, long *eline);

	int (*load)(CONF *conf, BIO *bp, long *eline);

	int (MS_FAR *dump)(CONF *conf, BIO *bp);

	int (*dump)(CONF *conf, BIO *bp);

	int (MS_FAR *is_number)(CONF *conf, char c);

	int (*is_number)(CONF *conf, char c);

	int (MS_FAR *to_int)(CONF *conf, char c);

	int (*to_int)(CONF *conf, char c);

	};

	};





int CONF_set_default_method(CONF_METHOD *meth);

int CONF_set_default_method(CONF_METHOD *meth);