commit c73cd05468fba4bba5762a654aacdd9d90ecd272 (tree)
parent 235ded6265b65e7e60a6386417456bbafbcdbc77
Author: Andrew Kelley <andrew@ziglang.org>
Date: Wed, 13 Mar 2019 01:00:12 -0400
musl: remove files that have case conflicts
Diffstat:
9 files changed, 0 insertions(+), 170 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4274,21 +4274,16 @@ set(ZIG_LIBC_FILES
"include/generic-musl/linux/netfilter/xt_AUDIT.h"
"include/generic-musl/linux/netfilter/xt_CHECKSUM.h"
"include/generic-musl/linux/netfilter/xt_CLASSIFY.h"
- "include/generic-musl/linux/netfilter/xt_CONNMARK.h"
"include/generic-musl/linux/netfilter/xt_CONNSECMARK.h"
"include/generic-musl/linux/netfilter/xt_CT.h"
- "include/generic-musl/linux/netfilter/xt_DSCP.h"
"include/generic-musl/linux/netfilter/xt_HMARK.h"
"include/generic-musl/linux/netfilter/xt_IDLETIMER.h"
"include/generic-musl/linux/netfilter/xt_LED.h"
"include/generic-musl/linux/netfilter/xt_LOG.h"
- "include/generic-musl/linux/netfilter/xt_MARK.h"
"include/generic-musl/linux/netfilter/xt_NFLOG.h"
"include/generic-musl/linux/netfilter/xt_NFQUEUE.h"
- "include/generic-musl/linux/netfilter/xt_RATEEST.h"
"include/generic-musl/linux/netfilter/xt_SECMARK.h"
"include/generic-musl/linux/netfilter/xt_SYNPROXY.h"
- "include/generic-musl/linux/netfilter/xt_TCPMSS.h"
"include/generic-musl/linux/netfilter/xt_TCPOPTSTRIP.h"
"include/generic-musl/linux/netfilter/xt_TEE.h"
"include/generic-musl/linux/netfilter/xt_TPROXY.h"
@@ -4365,16 +4360,13 @@ set(ZIG_LIBC_FILES
"include/generic-musl/linux/netfilter_ipv4.h"
"include/generic-musl/linux/netfilter_ipv4/ip_tables.h"
"include/generic-musl/linux/netfilter_ipv4/ipt_CLUSTERIP.h"
- "include/generic-musl/linux/netfilter_ipv4/ipt_ECN.h"
"include/generic-musl/linux/netfilter_ipv4/ipt_LOG.h"
"include/generic-musl/linux/netfilter_ipv4/ipt_REJECT.h"
- "include/generic-musl/linux/netfilter_ipv4/ipt_TTL.h"
"include/generic-musl/linux/netfilter_ipv4/ipt_ah.h"
"include/generic-musl/linux/netfilter_ipv4/ipt_ecn.h"
"include/generic-musl/linux/netfilter_ipv4/ipt_ttl.h"
"include/generic-musl/linux/netfilter_ipv6.h"
"include/generic-musl/linux/netfilter_ipv6/ip6_tables.h"
- "include/generic-musl/linux/netfilter_ipv6/ip6t_HL.h"
"include/generic-musl/linux/netfilter_ipv6/ip6t_LOG.h"
"include/generic-musl/linux/netfilter_ipv6/ip6t_NPT.h"
"include/generic-musl/linux/netfilter_ipv6/ip6t_REJECT.h"
diff --git a/libc/include/generic-musl/linux/netfilter/xt_CONNMARK.h b/libc/include/generic-musl/linux/netfilter/xt_CONNMARK.h
@@ -1,7 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _XT_CONNMARK_H_target
-#define _XT_CONNMARK_H_target
-
-#include <linux/netfilter/xt_connmark.h>
-
-#endif /*_XT_CONNMARK_H_target*/
-\ No newline at end of file
diff --git a/libc/include/generic-musl/linux/netfilter/xt_DSCP.h b/libc/include/generic-musl/linux/netfilter/xt_DSCP.h
@@ -1,27 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/* x_tables module for setting the IPv4/IPv6 DSCP field
- *
- * (C) 2002 Harald Welte <laforge@gnumonks.org>
- * based on ipt_FTOS.c (C) 2000 by Matthew G. Marsh <mgm@paktronix.com>
- * This software is distributed under GNU GPL v2, 1991
- *
- * See RFC2474 for a description of the DSCP field within the IP Header.
- *
- * xt_DSCP.h,v 1.7 2002/03/14 12:03:13 laforge Exp
-*/
-#ifndef _XT_DSCP_TARGET_H
-#define _XT_DSCP_TARGET_H
-#include <linux/netfilter/xt_dscp.h>
-#include <linux/types.h>
-
-/* target info */
-struct xt_DSCP_info {
- __u8 dscp;
-};
-
-struct xt_tos_target_info {
- __u8 tos_value;
- __u8 tos_mask;
-};
-
-#endif /* _XT_DSCP_TARGET_H */
-\ No newline at end of file
diff --git a/libc/include/generic-musl/linux/netfilter/xt_MARK.h b/libc/include/generic-musl/linux/netfilter/xt_MARK.h
@@ -1,7 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _XT_MARK_H_target
-#define _XT_MARK_H_target
-
-#include <linux/netfilter/xt_mark.h>
-
-#endif /*_XT_MARK_H_target */
-\ No newline at end of file
diff --git a/libc/include/generic-musl/linux/netfilter/xt_RATEEST.h b/libc/include/generic-musl/linux/netfilter/xt_RATEEST.h
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _XT_RATEEST_TARGET_H
-#define _XT_RATEEST_TARGET_H
-
-#include <linux/types.h>
-#include <linux/if.h>
-
-struct xt_rateest_target_info {
- char name[IFNAMSIZ];
- __s8 interval;
- __u8 ewma_log;
-
- /* Used internally by the kernel */
- struct xt_rateest *est __attribute__((aligned(8)));
-};
-
-#endif /* _XT_RATEEST_TARGET_H */
-\ No newline at end of file
diff --git a/libc/include/generic-musl/linux/netfilter/xt_TCPMSS.h b/libc/include/generic-musl/linux/netfilter/xt_TCPMSS.h
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _XT_TCPMSS_H
-#define _XT_TCPMSS_H
-
-#include <linux/types.h>
-
-struct xt_tcpmss_info {
- __u16 mss;
-};
-
-#define XT_TCPMSS_CLAMP_PMTU 0xffff
-
-#endif /* _XT_TCPMSS_H */
-\ No newline at end of file
diff --git a/libc/include/generic-musl/linux/netfilter_ipv4/ipt_ECN.h b/libc/include/generic-musl/linux/netfilter_ipv4/ipt_ECN.h
@@ -1,34 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/* Header file for iptables ipt_ECN target
- *
- * (C) 2002 by Harald Welte <laforge@gnumonks.org>
- *
- * This software is distributed under GNU GPL v2, 1991
- *
- * ipt_ECN.h,v 1.3 2002/05/29 12:17:40 laforge Exp
-*/
-#ifndef _IPT_ECN_TARGET_H
-#define _IPT_ECN_TARGET_H
-
-#include <linux/types.h>
-#include <linux/netfilter/xt_DSCP.h>
-
-#define IPT_ECN_IP_MASK (~XT_DSCP_MASK)
-
-#define IPT_ECN_OP_SET_IP 0x01 /* set ECN bits of IPv4 header */
-#define IPT_ECN_OP_SET_ECE 0x10 /* set ECE bit of TCP header */
-#define IPT_ECN_OP_SET_CWR 0x20 /* set CWR bit of TCP header */
-
-#define IPT_ECN_OP_MASK 0xce
-
-struct ipt_ECN_info {
- __u8 operation; /* bitset of operations */
- __u8 ip_ect; /* ECT codepoint of IPv4 header, pre-shifted */
- union {
- struct {
- __u8 ece:1, cwr:1; /* TCP ECT bits */
- } tcp;
- } proto;
-};
-
-#endif /* _IPT_ECN_TARGET_H */
-\ No newline at end of file
diff --git a/libc/include/generic-musl/linux/netfilter_ipv4/ipt_TTL.h b/libc/include/generic-musl/linux/netfilter_ipv4/ipt_TTL.h
@@ -1,24 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/* TTL modification module for IP tables
- * (C) 2000 by Harald Welte <laforge@netfilter.org> */
-
-#ifndef _IPT_TTL_H
-#define _IPT_TTL_H
-
-#include <linux/types.h>
-
-enum {
- IPT_TTL_SET = 0,
- IPT_TTL_INC,
- IPT_TTL_DEC
-};
-
-#define IPT_TTL_MAXMODE IPT_TTL_DEC
-
-struct ipt_TTL_info {
- __u8 mode;
- __u8 ttl;
-};
-
-
-#endif
-\ No newline at end of file
diff --git a/libc/include/generic-musl/linux/netfilter_ipv6/ip6t_HL.h b/libc/include/generic-musl/linux/netfilter_ipv6/ip6t_HL.h
@@ -1,25 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/* Hop Limit modification module for ip6tables
- * Maciej Soltysiak <solt@dns.toxicfilms.tv>
- * Based on HW's TTL module */
-
-#ifndef _IP6T_HL_H
-#define _IP6T_HL_H
-
-#include <linux/types.h>
-
-enum {
- IP6T_HL_SET = 0,
- IP6T_HL_INC,
- IP6T_HL_DEC
-};
-
-#define IP6T_HL_MAXMODE IP6T_HL_DEC
-
-struct ip6t_HL_info {
- __u8 mode;
- __u8 hop_limit;
-};
-
-
-#endif
-\ No newline at end of file
