mailing list of musl libc
 help / color / mirror / code / Atom feed
From: Hauke Mehrtens <hauke@hauke-m.de>
To: musl@lists.openwall.com
Cc: felix.janda@posteo.de, dalias@libc.org,
	Hauke Mehrtens <hauke@hauke-m.de>
Subject: kernel: suppress some more Linux uapi definitions
Date: Fri,  4 Aug 2017 17:09:28 +0200	[thread overview]
Message-ID: <20170804150928.27579-1-hauke@hauke-m.de> (raw)

The following commit activated the suppression of some uapi definitions
in musl 04983f227238 ("make netinet/in.h suppress clashing definitions
from kernel headers"), but it still misses some of the definitions for
other files.

This will deactivate the definitions in the user space header files
exported by the Linux kernel.

This fully works when Felix's patch posted here is applied to the Linux
kernel:
https://patchwork.kernel.org/patch/9869953/

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 include/net/if.h    | 7 +++++++
 include/sys/xattr.h | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/include/net/if.h b/include/net/if.h
index 2f2fcc10..21f10801 100644
--- a/include/net/if.h
+++ b/include/net/if.h
@@ -125,6 +125,13 @@ struct ifconf {
 #define ifc_req		ifc_ifcu.ifcu_req
 #define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0)
 
+#define __UAPI_DEF_IF_IFCONF 0
+#define __UAPI_DEF_IF_IFMAP 0
+#define __UAPI_DEF_IF_IFNAMSIZ 0
+#define __UAPI_DEF_IF_IFREQ 0
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
+
 #endif
 
 #ifdef __cplusplus
diff --git a/include/sys/xattr.h b/include/sys/xattr.h
index 6479fcc6..7a0197ba 100644
--- a/include/sys/xattr.h
+++ b/include/sys/xattr.h
@@ -24,6 +24,8 @@ int removexattr(const char *, const char *);
 int lremovexattr(const char *, const char *);
 int fremovexattr(int, const char *);
 
+#define __UAPI_DEF_XATTR 0
+
 #ifdef __cplusplus
 }
 #endif
-- 
2.11.0



             reply	other threads:[~2017-08-04 15:09 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-04 15:09 Hauke Mehrtens [this message]
2018-01-01 18:50 ` Hauke Mehrtens

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170804150928.27579-1-hauke@hauke-m.de \
    --to=hauke@hauke-m.de \
    --cc=dalias@libc.org \
    --cc=felix.janda@posteo.de \
    --cc=musl@lists.openwall.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/musl/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).