X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fstack%2Fstack.h;h=0f825cc0c4a69a3340ad72b7f11d5abdf1a5229a;hb=a5fcd09e7552dedf87d5a1ff5d07a0397bc057cb;hp=6dc52db63cc2c564ff437e51b17f6c65a19beb2c;hpb=eb90a483ad85e9dc430610a78362837ad344cac1;p=oweals%2Fopenssl.git diff --git a/crypto/stack/stack.h b/crypto/stack/stack.h index 6dc52db63c..0f825cc0c4 100644 --- a/crypto/stack/stack.h +++ b/crypto/stack/stack.h @@ -73,11 +73,16 @@ typedef struct stack_st int (*comp)(); } STACK; -#define sk_num(sk) ((sk)->num) -#define sk_value(sk,n) ((sk)->data[n]) #define sk_new_null() sk_new(NULL) -#ifndef NOPROTO + +#define M_sk_num(sk) ((sk)->num) +#define M_sk_value(sk,n) ((sk)->data[n]) + +int sk_num(STACK *); +char *sk_value(STACK *, int); + +char *sk_set(STACK *, int, char *); STACK *sk_new(int (*cmp)()); void sk_free(STACK *); @@ -93,25 +98,7 @@ char *sk_pop(STACK *st); void sk_zero(STACK *st); int (*sk_set_cmp_func(STACK *sk, int (*c)()))(); STACK *sk_dup(STACK *st); - -#else - -STACK *sk_new(); -void sk_free(); -void sk_pop_free(); -int sk_insert(); -char *sk_delete(); -char *sk_delete_ptr(); -int sk_find(); -int sk_push(); -int sk_unshift(); -char *sk_shift(); -char *sk_pop(); -void sk_zero(); -int (*sk_set_cmp_func())(); -STACK *sk_dup(); - -#endif +void sk_sort(STACK *st); #ifdef __cplusplus }