Browse Source

Merge pull request #13067 from neheb/chao

chaosvpn: fix compilation without sys/cdefs
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
e03633fefe
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 1 deletions
  1. +1
    -1
      net/chaosvpn/Makefile
  2. +32
    -0
      net/chaosvpn/patches/020-cdefs.patch

+ 1
- 1
net/chaosvpn/Makefile View File

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


+ 32
- 0
net/chaosvpn/patches/020-cdefs.patch 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 */

Loading…
Cancel
Save