aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog27
-rw-r--r--argp/argp-help.c5
-rw-r--r--linuxthreads/internals.h4
-rw-r--r--linuxthreads_db/thread_dbP.h3
-rw-r--r--locale/programs/xstrdup.c10
-rw-r--r--math/basic-test.c2
-rw-r--r--stdlib/tst-environ.c19
-rw-r--r--sysdeps/generic/s_nexttowardf.c6
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/sigaction.h15
-rw-r--r--sysdeps/unix/sysv/linux/alpha/sys/ucontext.h20
-rw-r--r--sysdeps/unix/sysv/linux/bits/sigaction.h6
11 files changed, 95 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 89d389ea74..bbf244da7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+1999-10-12 Andreas Jaeger <aj@suse.de>
+
+ * stdlib/tst-environ.c: Include <string.h> for strcpy declaration.
+
+ * math/basic-test.c: Fix typo.
+
+ * locale/programs/xstrdup.c: Include string.h for glibc
+ compilation to get string prototypes.
+
+ * sysdeps/unix/sysv/linux/alpha/sys/ucontext.h: Add definition of
+ gregset_t and fpregset_t.
+
+ * sysdeps/generic/s_nexttowardf.c: Add parenthesis to shut up gcc
+ warnings. Correct value for x == 0.
+
+ * argp/argp-help.c: Remove broken definition of flockfile and
+ funlockfile.
+
+1999-10-12 Andreas Schwab <schwab@suse.de>
+
+ * sysdeps/unix/sysv/linux/alpha/bits/sigaction.h: Update to match
+ generic Linux version.
+
+1999-10-12 Ulrich Drepper <drepper@cygnus.com>
+
+ * sysdeps/unix/sysv/linux/bits/sigaction.h: Remove K&R compatibility.
+
1999-10-11 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h: Add gregset_t
diff --git a/argp/argp-help.c b/argp/argp-help.c
index f5d96fb1ef..5ab6aa7863 100644
--- a/argp/argp-help.c
+++ b/argp/argp-help.c
@@ -62,11 +62,6 @@ char *alloca ();
# endif
#endif
-#ifdef USE_IN_LIBIO
-# define flockfile(s) _IO_flockfile (s)
-# define funlockfile(s) _IO_funlockfile (s)
-#endif
-
#include "argp.h"
#include "argp-fmtstream.h"
#include "argp-namefrob.h"
diff --git a/linuxthreads/internals.h b/linuxthreads/internals.h
index 14c4b4e72c..6e9dc102de 100644
--- a/linuxthreads/internals.h
+++ b/linuxthreads/internals.h
@@ -358,9 +358,9 @@ extern void __pthread_kill_other_threads_np __P ((void));
extern int __libc_close (int fd);
extern int __libc_nanosleep (const struct timespec *requested_time,
struct timespec *remaining);
-extern int __libc_read (int fd, void *buf, size_t count);
+extern ssize_t __libc_read (int fd, void *buf, size_t count);
extern pid_t __libc_waitpid (pid_t pid, int *stat_loc, int options);
-extern int __libc_write (int fd, const void *buf, size_t count);
+extern ssize_t __libc_write (int fd, const void *buf, size_t count);
/* Prototypes for some of the new semaphore functions. */
extern int __new_sem_post (sem_t * sem);
diff --git a/linuxthreads_db/thread_dbP.h b/linuxthreads_db/thread_dbP.h
index 8db5b588dd..1fd09e965b 100644
--- a/linuxthreads_db/thread_dbP.h
+++ b/linuxthreads_db/thread_dbP.h
@@ -2,6 +2,7 @@
#ifndef _THREAD_DBP_H
#define _THREAD_DBP_H 1
+#include <string.h>
#include "thread_db.h"
#include "../linuxthreads/internals.h"
@@ -10,8 +11,6 @@
/* Comment out the following for less verbose output. */
#define LOG(c) __libc_write (2, c "\n", strlen (c "\n"))
-extern ssize_t __libc_write (int, const void *, size_t);
-
/* Handle for a process. This type is opaque. */
diff --git a/locale/programs/xstrdup.c b/locale/programs/xstrdup.c
index 4c2551e26a..3947dd19ce 100644
--- a/locale/programs/xstrdup.c
+++ b/locale/programs/xstrdup.c
@@ -1,5 +1,5 @@
/* xstrdup.c -- copy a string with out of memory checking
- Copyright (C) 1990, 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1990, 1996, 1997, 1999 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
@@ -18,13 +18,13 @@
Boston, MA 02111-1307, USA. */
#ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
#endif
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
-#include <string.h>
+#if defined STDC_HEADERS || defined HAVE_STRING_H || __LIBC
+# include <string.h>
#else
-#include <strings.h>
+# include <strings.h>
#endif
void *xmalloc __P ((size_t n));
char *xstrdup __P ((char *string));
diff --git a/math/basic-test.c b/math/basic-test.c
index 470651968b..5d26e8408c 100644
--- a/math/basic-test.c
+++ b/math/basic-test.c
@@ -106,7 +106,7 @@ NAME (void) \
TEST_FUNC (float_test, float, nanf, FLT_EPSILON, HUGE_VALF)
TEST_FUNC (double_test, double, nan, DBL_EPSILON, HUGE_VAL)
#ifndef NO_LONG_DOUBLE
-TEST_FUNC (ldouble_test, long double, nan, LDBL_EPSILON, HUGE_VALL)
+TEST_FUNC (ldouble_test, long double, nanl, LDBL_EPSILON, HUGE_VALL)
#endif
int
diff --git a/stdlib/tst-environ.c b/stdlib/tst-environ.c
index f728ce5890..79eb0cb0da 100644
--- a/stdlib/tst-environ.c
+++ b/stdlib/tst-environ.c
@@ -1,5 +1,24 @@
+/* Copyright (C) 1999 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
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#define VAR "FOOBAR"
diff --git a/sysdeps/generic/s_nexttowardf.c b/sysdeps/generic/s_nexttowardf.c
index 56cc04c10b..f99b503f4e 100644
--- a/sysdeps/generic/s_nexttowardf.c
+++ b/sysdeps/generic/s_nexttowardf.c
@@ -45,21 +45,21 @@
if((long double) x==y) return y; /* x=y, return y */
if(ix==0) { /* x == 0 */
float x2;
- SET_FLOAT_WORD(x,(u_int32_t)((hy>>32)&0x80000000)|1);/* return +-minsub*/
+ SET_FLOAT_WORD(x,(u_int32_t)(hy&0x80000000)|1);/* return +-minsub*/
x2 = x*x;
if(x2==x) return x2; else return x; /* raise underflow flag */
}
if(hx>=0) { /* x > 0 */
if(hy<0||(ix>>23)>(iy>>20)-0x380
|| ((ix>>23)==(iy>>20)-0x380
- && (ix&0x7fffff)>((hy<<3)|(ly>>29))&0x7fffff)) /* x > y, x -= ulp */
+ && (ix&0x7fffff)>(((hy<<3)|(ly>>29))&0x7fffff))) /* x > y, x -= ulp */
hx -= 1;
else /* x < y, x += ulp */
hx += 1;
} else { /* x < 0 */
if(hy>=0||(ix>>23)>(iy>>20)-0x380
|| ((ix>>23)==(iy>>20)-0x380
- && (ix&0x7fffff)>((hy<<3)|(ly>>29))&0x7fffff)) /* x < y, x -= ulp */
+ && (ix&0x7fffff)>(((hy<<3)|(ly>>29))&0x7fffff))) /* x < y, x -= ulp */
hx -= 1;
else /* x > y, x += ulp */
hx += 1;
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/sigaction.h b/sysdeps/unix/sysv/linux/alpha/bits/sigaction.h
index 2f8b3bad3c..7a586be7c9 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/sigaction.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/sigaction.h
@@ -1,5 +1,5 @@
/* The proper definitions for Linux/Alpha sigaction.
- Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1999 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
@@ -25,7 +25,20 @@
struct sigaction
{
/* Signal handler. */
+#ifdef __USE_POSIX199309
+ union
+ {
+ /* Used if SA_SIGINFO is not set. */
+ __sighandler_t sa_handler;
+ /* Used if SA_SIGINFO is set. */
+ void (*sa_sigaction) (int, siginfo_t *, void *);
+ }
+ __sigaction_handler;
+# define sa_handler __sigaction_handler.sa_handler
+# define sa_sigaction __sigaction_handler.sa_sigaction
+#else
__sighandler_t sa_handler;
+#endif
/* Additional set of signals to be blocked. */
__sigset_t sa_mask;
diff --git a/sysdeps/unix/sysv/linux/alpha/sys/ucontext.h b/sysdeps/unix/sysv/linux/alpha/sys/ucontext.h
index 08eeb6e4a2..50c643ae06 100644
--- a/sysdeps/unix/sysv/linux/alpha/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/alpha/sys/ucontext.h
@@ -24,6 +24,26 @@
#include <bits/sigcontext.h>
+
+/* Type for general register. */
+typedef long int greg_t;
+
+/* Number of general registers. */
+#define NGREG 33
+
+/* Container for all general registers. */
+typedef greg_t gregset_t[NGREG];
+
+/* Type for floating-point register. */
+typedef long int fpreg_t;
+
+/* Number of general registers. */
+#define NFPREG 32
+
+/* Container for all general registers. */
+typedef fpreg_t fpregset_t[NFPREG];
+
+
/* A machine context is exactly a sigcontext. */
typedef struct sigcontext mcontext_t;
diff --git a/sysdeps/unix/sysv/linux/bits/sigaction.h b/sysdeps/unix/sysv/linux/bits/sigaction.h
index b357c45342..d4ba74dfa8 100644
--- a/sysdeps/unix/sysv/linux/bits/sigaction.h
+++ b/sysdeps/unix/sysv/linux/bits/sigaction.h
@@ -1,5 +1,5 @@
/* The proper definitions for Linux's sigaction.
- Copyright (C) 1993, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+ Copyright (C) 1993, 94, 95, 96, 97, 98, 99 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
@@ -31,7 +31,7 @@ struct sigaction
/* Used if SA_SIGINFO is not set. */
__sighandler_t sa_handler;
/* Used if SA_SIGINFO is set. */
- void (*sa_sigaction) __PMT ((int, siginfo_t *, void *));
+ void (*sa_sigaction) (int, siginfo_t *, void *);
}
__sigaction_handler;
# define sa_handler __sigaction_handler.sa_handler
@@ -47,7 +47,7 @@ struct sigaction
int sa_flags;
/* Restore handler. */
- void (*sa_restorer) __PMT ((void));
+ void (*sa_restorer) (void);
};
/* Bits in `sa_flags'. */