Delete the unnecessary ERR and ERRC lines in makefiles, add some functionality

[oweals/openssl.git] / crypto / bio / bio.h

diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index f83b3e2f244b8d24a0d35d9fc524adced7d1f4a3..4f1b3e3e98812b989e18e64caa30c4828bcbc606 100644 (file)
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -63,7 +63,7 @@
 extern "C" {
 #endif
 
-#include "crypto.h"
+#include <openssl/crypto.h>
 
 /* These are the 'types' of BIOs */
 #define BIO_TYPE_NONE          0
@@ -446,10 +446,11 @@ int BIO_read_filename(BIO *b,const char *name);
 
 #ifndef NOPROTO
 
-int BIO_get_ex_num(BIO *bio);
+/* These two aren't currently implemented */
+/* int BIO_get_ex_num(BIO *bio); */
+/* void BIO_set_ex_free_func(BIO *bio,int idx,void (*cb)()); */
 int BIO_set_ex_data(BIO *bio,int idx,char *data);
 char *BIO_get_ex_data(BIO *bio,int idx);
-void BIO_set_ex_free_func(BIO *bio,int idx,void (*cb)());
 int BIO_get_ex_new_index(long argl, char *argp, int (*new_func)(),
        int (*dup_func)(), void (*free_func)());
 
@@ -498,7 +499,7 @@ BIO *BIO_new_fp();
 BIO *  BIO_new(BIO_METHOD *type);
 int    BIO_set(BIO *a,BIO_METHOD *type);
 int    BIO_free(BIO *a);
-int    BIO_read(BIO *b, char *data, int len);
+int    BIO_read(BIO *b, void *data, int len);
 int    BIO_gets(BIO *bp,char *buf, int size);
 int    BIO_write(BIO *b, const char *data, int len);
 int    BIO_puts(BIO *bp,const char *buf);
@@ -682,6 +683,10 @@ int BIO_printf();
 #endif
 
 /* 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 BIO functions. */
 
 /* Function codes. */
@@ -730,7 +735,7 @@ int BIO_printf();
 #define BIO_R_UNINITIALIZED                             120
 #define BIO_R_UNSUPPORTED_METHOD                        121
 #define BIO_R_WSASTARTUP                                122
- 
+
 #ifdef  __cplusplus
 }
 #endif