2 files changed, 3 insertions, 28 deletions
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 */