This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.
Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
Other format: | [Raw text] |
Hi! Without the following patch #include <sys/sysctl.h> #include <sys/sysinfo.h> int main (void) { struct sysinfo si; sysinfo (&si); return 0; } will not compile. 2004-04-29 Jakub Jelinek <jakub@redhat.com> [BZ #140] * sysdeps/unix/sysv/linux/sys/sysctl.h: Remove linux/compiler.h include. (_LINUX_KERNEL_H, _LINUX_TYPES_H, _LINUX_LIST_H): Only define if not yet defined, #undef back after including linux/sysctl.h if defined here. (__LINUX_COMPILER_H, __user): Define if not yet defined, #undef back after including linux/sysctl.h if defined here. --- libc/sysdeps/unix/sysv/linux/sys/sysctl.h.jj 2003-07-30 12:00:52.000000000 +0200 +++ libc/sysdeps/unix/sysv/linux/sys/sysctl.h 2004-04-29 21:26:10.088848633 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1999, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1999, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -23,14 +23,44 @@ #define __need_size_t #include <stddef.h> /* Prevent more kernel headers than necessary to be included. */ -#define _LINUX_KERNEL_H 1 -#define _LINUX_TYPES_H 1 -#define _LINUX_LIST_H 1 -/* We do need this one for the declarations in <linux/sysctl.h>, - since we've elided the inclusion of <linux/kernel.h> that gets them. */ -#include <linux/compiler.h> +#ifndef _LINUX_KERNEL_H +# define _LINUX_KERNEL_H 1 +# define __undef_LINUX_KERNEL_H +#endif +#ifndef _LINUX_TYPES_H +# define _LINUX_TYPES_H 1 +# define __undef_LINUX_TYPES_H +#endif +#ifndef _LINUX_LIST_H +# define _LINUX_LIST_H 1 +# define __undef_LINUX_LIST_H +#endif +#ifndef __LINUX_COMPILER_H +# define __LINUX_COMPILER_H 1 +# define __user +# define __undef__LINUX_COMPILER_H +#endif + #include <linux/sysctl.h> +#ifdef __undef_LINUX_KERNEL_H +# undef _LINUX_KERNEL_H +# undef __undef_LINUX_KERNEL_H +#endif +#ifdef __undef_LINUX_TYPES_H +# undef _LINUX_TYPES_H +# undef __undef_LINUX_TYPES_H +#endif +#ifdef __undef_LINUX_LIST_H +# undef _LINUX_LIST_H +# undef __undef_LINUX_LIST_H +#endif +#ifdef __undef__LINUX_COMPILER_H +# undef __LINUX_COMPILER_H +# undef __user +# undef __undef__LINUX_COMPILER_H +#endif + __BEGIN_DECLS /* Read or write system parameters. */ Jakub
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |