about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--stdio-common/Makefile7
-rw-r--r--stdio-common/vfprintf.c8
-rw-r--r--sysdeps/mach/hurd/dl-cache.c24
-rw-r--r--sysdeps/mach/libc-lock.h7
5 files changed, 14 insertions, 41 deletions
diff --git a/ChangeLog b/ChangeLog
index d65ec86f80..731f3a9361 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Sep 13 01:21:36 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* sysdeps/generic/schedbits.h (struct sched_param): Renamed from
+	struct sched_params.
+	* sysdeps/stub/sched_setp.c (__sched_setparam): struct
+	sched_params -> struct sched_param.
+	* sysdeps/stub/sched_getp.c (__sched_getparam): Likewise.
+	* sysdeps/stub/sched_sets.c (__sched_setscheduler): Likewise.
+
 Thu Sep 12 23:58:25 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
 
 	* sysdeps/mach/libc-lock.h (__libc_cleanup_region_start): Fix
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 4b9ec71338..8c7bae9c45 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -32,11 +32,8 @@ routines	:=							      \
 	perror psignal							      \
 	tmpfile tmpnam tempnam tempname					      \
 	getline getw putw						      \
-	remove rename
-
-ifneq (,$(filter %REENTRANT, $(defines)))
-routines += lockfile
-endif
+	remove rename							      \
+	lockfile
 
 aux	:= errlist siglist
 distribute := _itoa.h printf-parse.h
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index 1316adacbf..b2523574a8 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -152,14 +152,9 @@ ssize_t __wprintf_pad __P ((FILE *, wchar_t pad, size_t n));
 # define is_longlong is_long_double
 #endif
 
-
-#ifdef _LIBC_REENTRANT
 extern void __flockfile (FILE *);
 weak_extern (__flockfile);
 extern void __funlockfile (FILE *);
-weak_extern (__funlockfile);
-#endif
-
 
 /* Global variables.  */
 static const char null[] = "(null)";
@@ -1312,10 +1307,7 @@ do_positional:
 
 all_done:
   /* Unlock the stream.  */
-#ifdef USE_IN_LIBIO
-  /* (stdio has no locking yet.) */
   __libc_cleanup_region_end (1);
-#endif
 
   return done;
 }
diff --git a/sysdeps/mach/hurd/dl-cache.c b/sysdeps/mach/hurd/dl-cache.c
index 2981245c00..7d919cd6a9 100644
--- a/sysdeps/mach/hurd/dl-cache.c
+++ b/sysdeps/mach/hurd/dl-cache.c
@@ -22,27 +22,3 @@ _dl_load_cache_lookup (const char *name)
 {
   return 0;
 }
-/* Stubby version of dl-cache; the Hurd doesn't support this "feature".
-Copyright (C) 1996 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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
-
-const char *
-_dl_load_cache_lookup (const char *name)
-{
-  return 0;
-}
diff --git a/sysdeps/mach/libc-lock.h b/sysdeps/mach/libc-lock.h
index ea3d306a52..1c9b16cf90 100644
--- a/sysdeps/mach/libc-lock.h
+++ b/sysdeps/mach/libc-lock.h
@@ -59,16 +59,15 @@ typedef struct __libc_lock_opaque__ __libc_lock_t;
 /* Start a critical region with a cleanup function */
 #define __libc_cleanup_region_start(FCT, ARG)				    \
 {									    \
-  (typeof FCT) __save_FCT = FCT;					    \
-  (typeof ARG) __save_ARG = ARG;					    \
+  typeof (FCT) __save_FCT = FCT;					    \
+  typeof (ARG) __save_ARG = ARG;					    \
   /* close brace is in __libc_cleanup_region_end below. */
 
 /* End a critical region started with __libc_cleanup_region_start. */
 #define __libc_cleanup_region_end(DOIT)					    \
   if (DOIT)								    \
-    (* __save_FCT)(__save_ARG);						    \
+    (*__save_FCT)(__save_ARG);						    \
 }
 
-      
 
 #endif	/* libc-lock.h */