merge with vendor

1 files changed, 39 insertions, 41 deletions

diff --git a/src/Mayaqua/win32_inc/openssl/stack.h b/src/Mayaqua/win32_inc/openssl/stack.h
index 7f3b13d2..eb98b8af 100644
--- a/src/Mayaqua/win32_inc/openssl/stack.h
+++ b/src/Mayaqua/win32_inc/openssl/stack.h
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written

  * by Eric Young (eay@cryptsoft.com).

  * The implementation was written so as to conform with Netscapes SSL.

- * 

+ *

  * This library is free for commercial and non-commercial use as long as

  * the following conditions are aheared to.  The following conditions

  * apply to all code found in this distribution, be it the RC4, RSA,

  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation

  * included with this distribution is covered by the same copyright terms

  * except that the holder is Tim Hudson (tjh@cryptsoft.com).

- * 

+ *

  * Copyright remains Eric Young's, and as such any Copyright notices in

  * the code are not to be removed.

  * If this package is used in a product, Eric Young should be given attribution

  * as the author of the parts of the library used.

  * This can be in the form of a textual message at program startup or

  * in documentation (online or textual) provided with the package.

- * 

+ *

  * Redistribution and use in source and binary forms, with or without

  * modification, are permitted provided that the following conditions

  * are met:

@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"

  *    The word 'cryptographic' can be left out if the rouines from the library

  *    being used are not cryptographic related :-).

- * 4. If you include any Windows specific code (or a derivative thereof) from 

+ * 4. If you include any Windows specific code (or a derivative thereof) from

  *    the apps directory (application code) you must include an acknowledgement:

  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"

- * 

+ *

  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND

  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

  * SUCH DAMAGE.

- * 

+ *

  * The licence and distribution terms for any publically available version or

  * derivative of this code cannot be changed.  i.e. this code cannot simply be

  * copied and put under another distribution licence

@@ -57,50 +57,48 @@
  */

 

 #ifndef HEADER_STACK_H

-#define HEADER_STACK_H

+# define HEADER_STACK_H

 

 #ifdef  __cplusplus

 extern "C" {

 #endif

 

-typedef struct stack_st

-	{

-	int num;

-	char **data;

-	int sorted;

-

-	int num_alloc;

-	int (*comp)(const char * const *, const char * const *);

-	} STACK;

+typedef struct stack_st {

+    int num;

+    char **data;

+    int sorted;

+    int num_alloc;

+    int (*comp) (const void *, const void *);

+} _STACK;                       /* Use STACK_OF(...) instead */

 

-#define M_sk_num(sk)		((sk) ? (sk)->num:-1)

-#define M_sk_value(sk,n)	((sk) ? (sk)->data[n] : NULL)

+# define M_sk_num(sk)            ((sk) ? (sk)->num:-1)

+# define M_sk_value(sk,n)        ((sk) ? (sk)->data[n] : NULL)

 

-int sk_num(const STACK *);

-char *sk_value(const STACK *, int);

+int sk_num(const _STACK *);

+void *sk_value(const _STACK *, int);

 

-char *sk_set(STACK *, int, char *);

+void *sk_set(_STACK *, int, void *);

 

-STACK *sk_new(int (*cmp)(const char * const *, const char * const *));

-STACK *sk_new_null(void);

-void sk_free(STACK *);

-void sk_pop_free(STACK *st, void (*func)(void *));

-int sk_insert(STACK *sk,char *data,int where);

-char *sk_delete(STACK *st,int loc);

-char *sk_delete_ptr(STACK *st, char *p);

-int sk_find(STACK *st,char *data);

-int sk_find_ex(STACK *st,char *data);

-int sk_push(STACK *st,char *data);

-int sk_unshift(STACK *st,char *data);

-char *sk_shift(STACK *st);

-char *sk_pop(STACK *st);

-void sk_zero(STACK *st);

-int (*sk_set_cmp_func(STACK *sk, int (*c)(const char * const *,

-			const char * const *)))

-			(const char * const *, const char * const *);

-STACK *sk_dup(STACK *st);

-void sk_sort(STACK *st);

-int sk_is_sorted(const STACK *st);

+_STACK *sk_new(int (*cmp) (const void *, const void *));

+_STACK *sk_new_null(void);

+void sk_free(_STACK *);

+void sk_pop_free(_STACK *st, void (*func) (void *));

+_STACK *sk_deep_copy(_STACK *, void *(*)(void *), void (*)(void *));

+int sk_insert(_STACK *sk, void *data, int where);

+void *sk_delete(_STACK *st, int loc);

+void *sk_delete_ptr(_STACK *st, void *p);

+int sk_find(_STACK *st, void *data);

+int sk_find_ex(_STACK *st, void *data);

+int sk_push(_STACK *st, void *data);

+int sk_unshift(_STACK *st, void *data);

+void *sk_shift(_STACK *st);

+void *sk_pop(_STACK *st);

+void sk_zero(_STACK *st);

+int (*sk_set_cmp_func(_STACK *sk, int (*c) (const void *, const void *)))

+ (const void *, const void *);

+_STACK *sk_dup(_STACK *st);

+void sk_sort(_STACK *st);

+int sk_is_sorted(const _STACK *st);

 

 #ifdef  __cplusplus

 }