src/patches/glibc-2.3.6-linux_types-1.patch

   1 Submitted By: DJ Lucas <dj at linuxfromscratch dot org>
   2 Date: 2006-04-05
   3 Initial Package Version: 2.3.6
   4 Upstream Status: Committed
   5 Origin: Glibc CVS
   6 Description: Fixes build errors where linux/types.h is included after sys/kd.h.
   7
   8 diff -Naur glibc-2.3.6-orig/sysdeps/unix/sysv/linux/sys/kd.h glibc-2.3.6/sysdeps/unix/sysv/linux/sys/kd.h
   9 --- glibc-2.3.6-orig/sysdeps/unix/sysv/linux/sys/kd.h   2001-07-05 23:56:21.000000000 -0500
  10 +++ glibc-2.3.6/sysdeps/unix/sysv/linux/sys/kd.h        2006-04-04 21:40:50.000000000 -0500
  11 @@ -1,4 +1,4 @@
  12 -/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
  13 +/* Copyright (C) 1996, 1997, 2005 Free Software Foundation, Inc.
  14     This file is part of the GNU C Library.
  15
  16     The GNU C Library is free software; you can redistribute it and/or
  17 @@ -21,9 +21,15 @@
  18
  19  /* Make sure the <linux/types.h> header is not loaded.  */
  20  #ifndef _LINUX_TYPES_H
  21 -# define _LINUX_TYPES_H        1
  22 +# define _LINUX_TYPES_H                1
  23 +# define __undef_LINUX_TYPES_H
  24  #endif
  25
  26  #include <linux/kd.h>
  27
  28 +#ifdef __undef_LINUX_TYPES_H
  29 +# undef _LINUX_TYPES_H
  30 +# undef __undef_LINUX_TYPES_H
  31 +#endif
  32 +
  33  #endif /* sys/kd.h */