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]

[PATCH] Add multiple inclusion guards to useldt.h


Hi!

>From reading the code, I believe i686 --with-tls linuxthreads
are now broken.
i686/pt-machine.h includes "../useldt.h", and after change from yesterday
tls.h which includes <pt-machine.h> includes useldt.h unconditionally too.
But this header defines structures.

Untested patch below.

2004-09-25  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/i386/useldt.h: Avoid multiple inclusion.

--- libc/linuxthreads/sysdeps/i386/useldt.h.jj	2003-04-20 10:23:23.000000000 +0200
+++ libc/linuxthreads/sysdeps/i386/useldt.h	2004-09-25 10:01:47.243988345 +0200
@@ -1,6 +1,6 @@
 /* Special definitions for ix86 machine using segment register based
    thread descriptor.
-   Copyright (C) 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>.
 
@@ -19,6 +19,9 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.	*/
 
+#ifndef __USELDT_H
+#define __USELDT_H 1
+
 #ifndef __ASSEMBLER__
 #include <stddef.h>	/* For offsetof.  */
 #include <stdlib.h>	/* For abort().	 */
@@ -312,3 +315,5 @@ extern int __have_no_set_thread_area;
 /* Maximum size of the stack if the rlimit is unlimited.  */
 #define ARCH_STACK_MAX_SIZE	8*1024*1024
 #endif
+
+#endif

	Jakub


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]