4 files changed, 18 insertions, 18 deletions
diff --git a/sysdeps/generic/Dist b/sysdeps/generic/Dist
index 5d4075402d..36133eb9fa 100644
--- a/sysdeps/generic/Dist
+++ b/sysdeps/generic/Dist
@@ -1,6 +1,6 @@
 make_siglist.c signame.c signame.h
 det_endian.c
 entry.h
-errno-loc.c.
+errno-loc.c
 getresgid.c
 getresuid.c
diff --git a/sysdeps/generic/enbl-secure.c b/sysdeps/generic/enbl-secure.c
index 3f3fe23c54..7dcd4391fa 100644
--- a/sysdeps/generic/enbl-secure.c
+++ b/sysdeps/generic/enbl-secure.c
@@ -1,5 +1,5 @@
 /* Define and initialize the `__libc_enable_secure' flag.  Generic version.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998 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
@@ -26,13 +26,9 @@
 /* Safest assumption, if somehow the initializer isn't run.  */
 int __libc_enable_secure = 1;
 
-/* We often need the UID.  */
-extern uid_t __libc_uid;
-
 void
 __libc_init_secure (void)
 {
-  __libc_uid = __getuid ();
-  __libc_enable_secure = (__geteuid () != __libc_uid
+  __libc_enable_secure = (__geteuid () != __getuid ()
 			  || __getegid () != __getgid ());
 }
diff --git a/sysdeps/generic/ftruncate.c b/sysdeps/generic/ftruncate.c
index 8e067ac2b8..ece306f994 100644
--- a/sysdeps/generic/ftruncate.c
+++ b/sysdeps/generic/ftruncate.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996, 1997, 1998 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
@@ -16,13 +16,13 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <sys/types.h>
 #include <errno.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 /* Truncate the file FD refers to to LENGTH bytes.  */
 int
-ftruncate (fd, length)
+__ftruncate (fd, length)
      int fd;
      off_t length;
 {
@@ -30,5 +30,7 @@ ftruncate (fd, length)
   return -1;
 }
 
+weak_alias (__ftruncate, ftruncate)
+     
 stub_warning (ftruncate)
 #include <stub-tag.h>
diff --git a/sysdeps/generic/glob.c b/sysdeps/generic/glob.c
index 29697f4c55..c26b2a6115 100644
--- a/sysdeps/generic/glob.c
+++ b/sysdeps/generic/glob.c
@@ -253,14 +253,16 @@ extern char *alloca ();
 
 /* Some system header files erroneously define these.
    We want our own definitions from <glob.h> to take precedence.  */
-#undef	GLOB_ERR
-#undef	GLOB_MARK
-#undef	GLOB_NOSORT
-#undef	GLOB_DOOFFS
-#undef	GLOB_NOCHECK
-#undef	GLOB_APPEND
-#undef	GLOB_NOESCAPE
-#undef	GLOB_PERIOD
+#ifndef __GNU_LIBRARY__
+# undef	GLOB_ERR
+# undef	GLOB_MARK
+# undef	GLOB_NOSORT
+# undef	GLOB_DOOFFS
+# undef	GLOB_NOCHECK
+# undef	GLOB_APPEND
+# undef	GLOB_NOESCAPE
+# undef	GLOB_PERIOD
+#endif
 #include <glob.h>
 
 static