diff options
-rw-r--r-- | ChangeLog | 13 | ||||
-rw-r--r-- | libio/fmemopen.c | 1 | ||||
-rw-r--r-- | shadow/sgetspent_r.c | 6 | ||||
-rw-r--r-- | sysdeps/generic/syslog.c | 3 | ||||
-rw-r--r-- | sysdeps/mach/hurd/tls.h | 9 |
5 files changed, 27 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 6dfd1dbb92..816a17d431 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2005-02-02 Alfred M. Szmidt <ams@gnu.org> + + * sysdeps/mach/hurd/tls.h: Include <stdbool.h> + (dtv_t): Change pointer type to be a struct which also contains + information whether the memory pointed to is static TLS or not. + + * sysdeps/generic/syslog.c (send_flags) [!send_flags]: Define it. + + * shadow/sgetspent_r.c (FALSE): Macro renamed to ... + (FALSEP): ... this. Updated all references. + + * libio/fmemopen.c: Include <stdint.h>. + 2005-01-30 Ulrich Drepper <drepper@redhat.com> * nscd/nscd_helper.c (get_mapping): Use MSG_NOSIGNAL if available. diff --git a/libio/fmemopen.c b/libio/fmemopen.c index 51e849e846..7c8769a130 100644 --- a/libio/fmemopen.c +++ b/libio/fmemopen.c @@ -71,6 +71,7 @@ #include <libio.h> #include <stdio.h> #include <stdlib.h> +#include <stdint.h> #include <string.h> #include <sys/types.h> #include "libioP.h" diff --git a/shadow/sgetspent_r.c b/shadow/sgetspent_r.c index 01d22876ba..2ed350a1ad 100644 --- a/shadow/sgetspent_r.c +++ b/shadow/sgetspent_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 2005 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 @@ -30,7 +30,7 @@ struct spent_data {}; /* Predicate which always returns false, needed below. */ -#define FALSE(arg) 0 +#define FALSEP(arg) 0 #include <nss/nss_files/files-parse.c> @@ -77,7 +77,7 @@ LINE_PARSER INT_FIELD_MAYBE_NULL (result->sp_expire, ISCOLON, 0, 10, (long int), (long int) -1); if (*line != '\0') - INT_FIELD_MAYBE_NULL (result->sp_flag, FALSE, 0, 10, + INT_FIELD_MAYBE_NULL (result->sp_flag, FALSEP, 0, 10, (unsigned long int), ~0ul) else result->sp_flag = ~0ul; diff --git a/sysdeps/generic/syslog.c b/sysdeps/generic/syslog.c index 176265c29d..9c8f422aad 100644 --- a/sysdeps/generic/syslog.c +++ b/sysdeps/generic/syslog.c @@ -77,6 +77,9 @@ static void closelog_internal(void); static void sigpipe_handler (int); #endif +#ifndef send_flags +# define send_flags 0 +#endif struct cleanup_arg { diff --git a/sysdeps/mach/hurd/tls.h b/sysdeps/mach/hurd/tls.h index bc15b4dab6..cce42ef374 100644 --- a/sysdeps/mach/hurd/tls.h +++ b/sysdeps/mach/hurd/tls.h @@ -1,5 +1,5 @@ /* Definitions for thread-local data handling. Hurd version. - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2005 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,6 +23,7 @@ #if defined HAVE_TLS_SUPPORT && !defined ASSEMBLER # include <stddef.h> +# include <stdbool.h> # include <mach/mig_errors.h> # include <mach.h> @@ -31,7 +32,11 @@ typedef union dtv { size_t counter; - void *pointer; + struct + { + void *val; + bool is_static; + } pointer; } dtv_t; |