Improve #ifdefs for STACK_OF() helpers.

Discussed with claudio

diff --git a/usr.sbin/rpki-client/mft.c b/usr.sbin/rpki-client/mft.c
index bcf3217..fb26b99 100644 (file)
--- a/usr.sbin/rpki-client/mft.c
+++ b/usr.sbin/rpki-client/mft.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mft.c,v 1.67 2022/05/19 07:33:02 tb Exp $ */
+/*     $OpenBSD: mft.c,v 1.68 2022/05/23 14:10:18 tb Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -57,7 +57,7 @@ typedef struct {
 
 DECLARE_STACK_OF(FileAndHash);
 
-#if defined(LIBRESSL_VERSION_NUMBER)
+#ifndef DEFINE_STACK_OF
 #define sk_FileAndHash_num(sk)         SKM_sk_num(FileAndHash, (sk))
 #define sk_FileAndHash_value(sk, i)    SKM_sk_value(FileAndHash, (sk), (i))
 #endif

diff --git a/usr.sbin/rpki-client/roa.c b/usr.sbin/rpki-client/roa.c
index d9cb848..cbb5709 100644 (file)
--- a/usr.sbin/rpki-client/roa.c
+++ b/usr.sbin/rpki-client/roa.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: roa.c,v 1.44 2022/05/19 07:33:02 tb Exp $ */
+/*     $OpenBSD: roa.c,v 1.45 2022/05/23 14:10:18 tb Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -59,7 +59,7 @@ typedef struct {
 
 DECLARE_STACK_OF(ROAIPAddressFamily);
 
-#if defined(LIBRESSL_VERSION_NUMBER)
+#ifndef DEFINE_STACK_OF
 #define sk_ROAIPAddress_num(st)                SKM_sk_num(ROAIPAddress, (st))
 #define sk_ROAIPAddress_value(st, i)   SKM_sk_value(ROAIPAddress, (st), (i))