From c1167dde159487f5d60302196def3fc530ecd4a2 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 10 Feb 2007 01:45:01 -0800 Subject: [PATCH] --- yaml --- r: 47518 b: refs/heads/master c: 57a87bb0720a5cf7a9ece49a8c8ed288398fd1bb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/socket.h | 2 +- trunk/include/linux/stat.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 06feea5e52e1..3a17fcc0c5d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4564f9e5fd00767d11fcf61e0d52787706dfcc87 +refs/heads/master: 57a87bb0720a5cf7a9ece49a8c8ed288398fd1bb diff --git a/trunk/include/linux/socket.h b/trunk/include/linux/socket.h index fcd35a210e7f..28157a36e6cc 100644 --- a/trunk/include/linux/socket.h +++ b/trunk/include/linux/socket.h @@ -16,7 +16,7 @@ struct __kernel_sockaddr_storage { /* _SS_MAXSIZE value minus size of ss_family */ } __attribute__ ((aligned(_K_SS_ALIGNSIZE))); /* force desired alignment */ -#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) +#ifdef __KERNEL__ #include /* arch-dependent defines */ #include /* the SIOCxxx I/O controls */ diff --git a/trunk/include/linux/stat.h b/trunk/include/linux/stat.h index 679ef0d70b6b..4f8539ccff6c 100644 --- a/trunk/include/linux/stat.h +++ b/trunk/include/linux/stat.h @@ -7,7 +7,7 @@ #endif -#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) +#ifdef __KERNEL__ #define S_IFMT 00170000 #define S_IFSOCK 0140000