chaosvpn: fix compilation without sys/cdefs

sys/cdefs.h does not come included with musl. It's also deprecated.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2020-08-10 13:12:32 -07:00
parent 11c4323665
commit 286e42b3f4
No known key found for this signature in database
GPG Key ID: 36D31CFA845F0E3B
2 changed files with 33 additions and 1 deletions

View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=chaosvpn
PKG_VERSION:=2.19
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/ryd/chaosvpn/tar.gz/v$(PKG_VERSION)?

View File

@ -0,0 +1,32 @@
--- a/ar.h
+++ b/ar.h
@@ -20,8 +20,6 @@
#ifndef _AR_H
#define _AR_H 1
-#include <sys/cdefs.h>
-
/* Archive files start with the ARMAG identifying string. Then follows a
`struct ar_hdr', and as many bytes of member file data as its `ar_size'
member indicates, for each member file. */
@@ -31,7 +29,9 @@
#define ARFMAG "`\n" /* String in ar_fmag at end of each header. */
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
struct ar_hdr
{
@@ -43,6 +43,8 @@ struct ar_hdr
char ar_fmag[2]; /* Always contains ARFMAG. */
};
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
#endif /* ar.h */