Skip to contentSkip to conversation

Patch "uapi glibc compat: fix compilation when !__USE_MISC in glibc" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Jun 17, 2016 Stable branch

lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

uapi glibc compat: fix compilation when !__USE_MISC in glibc

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
uapi-glibc-compat-fix-compilation-when-__use_misc-in-glibc.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Fri Jun 17 11:18:18 PDT 2016

From: Nicolas Dichtel <[email protected]>
Date: Thu, 19 May 2016 17:26:29 +0200
Subject: uapi glibc compat: fix compilation when !__USE_MISC in glibc

From: Nicolas Dichtel <[email protected]>

[ Upstream commit f0a3fdca794d1e68ae284ef4caefe681f7c18e89 ]

These structures are defined only if __USE_MISC is set in glibc net/if.h headers, ie when _BSD_SOURCE or _SVID_SOURCE are defined.

CC Jan Engelhardt <[email protected]>
CC Josh Boyer <[email protected]>
CC Stephen Hemminger <[email protected]>
CC Waldemar Brodkorb <[email protected]>
CC Gabriel Laskar <[email protected]>
CC Mikko Rapeli <[email protected]>
Fixes 4a91cb61bb99 ("uapi glibc compat: fix compile errors when glibc net/if.h included before linux/if.h")
---
 include/uapi/linux/libc-compat.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/libc-compat.h +1 -1
@@ -52,7 +52,7 @@
 #if defined(__GLIBC__)
 
 /* Coordinate with glibc net/if.h header. */
-#if defined(_NET_IF_H)
+#if defined(_NET_IF_H) && defined(__USE_MISC)
 
 /* GLIBC headers included first so don't define anything
  * that would already be defined. */

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/uapi-glibc-compat-fix-compilation-when-__use_misc-in-glibc.patch