projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More evil cast removal.
[oweals/openssl.git]
/
crypto
/
conf
/
conf.h
diff --git
a/crypto/conf/conf.h
b/crypto/conf/conf.h
index a23ec95427badf6cf0c5a4871647a52b9e2a11e0..2401518a12e668e05b51336abd7fbd0912608a52 100644
(file)
--- a/
crypto/conf/conf.h
+++ b/
crypto/conf/conf.h
@@
-1,5
+1,5
@@
/* crypto/conf/conf.h */
/* crypto/conf/conf.h */
-/* Copyright (C) 1995-199
7
Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-199
8
Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
* This package is an SSL implementation written
* All rights reserved.
*
* This package is an SSL implementation written
@@
-63,8
+63,8
@@
extern "C" {
#endif
extern "C" {
#endif
-#include
"stack.h"
-#include
"lhash.h"
+#include
<openssl/stack.h>
+#include
<openssl/lhash.h>
typedef struct
{
typedef struct
{
@@
-73,7
+73,6
@@
typedef struct
char *value;
} CONF_VALUE;
char *value;
} CONF_VALUE;
-#ifndef NOPROTO
LHASH *CONF_load(LHASH *conf,char *file,long *eline);
STACK *CONF_get_section(LHASH *conf,char *section);
LHASH *CONF_load(LHASH *conf,char *file,long *eline);
STACK *CONF_get_section(LHASH *conf,char *section);
@@
-82,18
+81,11
@@
long CONF_get_number(LHASH *conf,char *group,char *name);
void CONF_free(LHASH *conf);
void ERR_load_CONF_strings(void );
void CONF_free(LHASH *conf);
void ERR_load_CONF_strings(void );
-#else
-
-LHASH *CONF_load();
-STACK *CONF_get_section();
-char *CONF_get_string();
-long CONF_get_number();
-void CONF_free();
-void ERR_load_CONF_strings();
-
-#endif
-
/* BEGIN ERROR CODES */
/* BEGIN ERROR CODES */
+/* The following lines are auto generated by the script mkerr.pl. Any changes
+ * made after this point may be overwritten when the script is next run.
+ */
+
/* Error codes for the CONF functions. */
/* Function codes. */
/* Error codes for the CONF functions. */
/* Function codes. */
@@
-106,7
+98,7
@@
void ERR_load_CONF_strings();
#define CONF_R_NO_CLOSE_BRACE 102
#define CONF_R_UNABLE_TO_CREATE_NEW_SECTION 103
#define CONF_R_VARIABLE_HAS_NO_VALUE 104
#define CONF_R_NO_CLOSE_BRACE 102
#define CONF_R_UNABLE_TO_CREATE_NEW_SECTION 103
#define CONF_R_VARIABLE_HAS_NO_VALUE 104
-
+
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
}
#endif