summaryrefslogtreecommitdiffstats
path: root/crypto/conf
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2002-02-21 16:38:09 +0000
committerRichard Levitte <levitte@openssl.org>2002-02-21 16:38:09 +0000
commitbfb863b8b5c19bafc54d5dca4603af416d9cc7a9 (patch)
treec1cd47d320ddf7f17fd18a0ddf3970af64e20f52 /crypto/conf
parentf261295d9c3c34a111be311b2a6381c48551dee6 (diff)
As in 0.9.7 and on, let's remove the use of MS_FAR, and thereby the
need for e_os.h.
Diffstat (limited to 'crypto/conf')
-rw-r--r--crypto/conf/conf.h19
1 files changed, 9 insertions, 10 deletions
diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h
index 31e4005f3d..3ae9803c17 100644
--- 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);