Update.

	* db2/compat.h: Allow EFTYPE being defined.
	* sysdeps/unix/bsd/bits/signum.h: Add definition for SIG_HOLD.
	* sysdeps/unix/bsd/ulimit.c: Include <ulimit.h>.
	* sysdeps/mach/hurd/bits/fcntl.h: Add O_LARGEFILE.
	* sysdeps/mach/bits/libc-lock.h: Fix typo.
	(__libc_once): Correctly unlock semaphore.
	* sysdeps/mach/hurd/dl-sysdep.c: Include <elf/ldsodefs.h>.
	* sysdeps/unix/bsd/getpt.c: Fix typo.
	Patches by UCHIYAMA Yasushi <uch@ddd.scei.sony.co.jp>.

1998-03-31  Ulrich Drepper  <drepper@cygnus.com>

8 files changed, 30 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index b84da8ae87..8f9cdc8026 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 1998-03-31  Ulrich Drepper  <drepper@cygnus.com>
 
+	* db2/compat.h: Allow EFTYPE being defined.
+	* sysdeps/unix/bsd/bits/signum.h: Add definition for SIG_HOLD.
+	* sysdeps/unix/bsd/ulimit.c: Include <ulimit.h>.
+	* sysdeps/mach/hurd/bits/fcntl.h: Add O_LARGEFILE.
+	* sysdeps/mach/bits/libc-lock.h: Fix typo.
+	(__libc_once): Correctly unlock semaphore.
+	* sysdeps/mach/hurd/dl-sysdep.c: Include <elf/ldsodefs.h>.
+	* sysdeps/unix/bsd/getpt.c: Fix typo.
+	Patches by UCHIYAMA Yasushi <uch@ddd.scei.sony.co.jp>.
+
+1998-03-31  Ulrich Drepper  <drepper@cygnus.com>
+
 	* sysdeps/unix/sysv/linux/bits/socket.h (MSG_*): Also define as
 	macros.
 
diff --git a/db2/compat.h b/db2/compat.h
index 5183befd60..8652ad97ec 100644
--- a/db2/compat.h
+++ b/db2/compat.h
@@ -2,7 +2,9 @@
 
 #include <sys/types.h>
 
-#define EFTYPE EINVAL
+#ifndef EFTYPE
+# define EFTYPE EINVAL
+#endif
 
 /* Emulate Solaris llseek().  */
 typedef loff_t offset_t;
diff --git a/sysdeps/mach/bits/libc-lock.h b/sysdeps/mach/bits/libc-lock.h
index 17eeefcdb5..acee2bf405 100644
--- a/sysdeps/mach/bits/libc-lock.h
+++ b/sysdeps/mach/bits/libc-lock.h
@@ -1,5 +1,5 @@
 /* libc-internal interface for mutex locks.  Mach cthreads 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
@@ -84,7 +84,7 @@ struct __libc_once
   };
 
 #define __libc_once_define(CLASS,NAME) \
-  CLASS struct __libc_once NAME = { MUTEX_INITIALZER, 0 }
+  CLASS struct __libc_once NAME = { MUTEX_INITIALIZER, 0 }
 
 
 /* Call handler iff the first call.  */
@@ -94,7 +94,7 @@ struct __libc_once
     if (!ONCE_CONTROL.done)						      \
       (INIT_FUNCTION) ();						      \
     ONCE_CONTROL.done = 1;						      \
-    __libc_lock_lock (ONCE_CONTROL.lock);				      \
+    __libc_lock_unlock (ONCE_CONTROL.lock);				      \
   } while (0)
 
 #ifdef _LIBC
diff --git a/sysdeps/mach/hurd/bits/fcntl.h b/sysdeps/mach/hurd/bits/fcntl.h
index 102c2a574f..962e77208b 100644
--- a/sysdeps/mach/hurd/bits/fcntl.h
+++ b/sysdeps/mach/hurd/bits/fcntl.h
@@ -1,5 +1,5 @@
 /* O_*, F_*, FD_* bit values for GNU.
-   Copyright (C) 1993, 1994, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 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
@@ -40,6 +40,7 @@
 #define	O_RDWR		(O_RDONLY|O_WRONLY) /* Open for reading and writing. */
 #define	O_ACCMODE	O_RDWR	/* Mask for file access modes.  */
 
+#define O_LARGEFILE	0
 
 
 /* File name translation flags.  These are understood by io servers;
diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index befd1120b4..7c936e9466 100644
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -1,5 +1,5 @@
 /* Operating system support for run-time dynamic linker.  Hurd version.
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 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
@@ -23,6 +23,7 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sys/mman.h>
+#include <elf/ldsodefs.h>
 #include <sys/wait.h>
 #include <assert.h>
 #include <sysdep.h>
diff --git a/sysdeps/unix/bsd/bits/signum.h b/sysdeps/unix/bsd/bits/signum.h
index 775240fc05..9e2428c6b7 100644
--- a/sysdeps/unix/bsd/bits/signum.h
+++ b/sysdeps/unix/bsd/bits/signum.h
@@ -1,5 +1,5 @@
 /* Signal number definitions.  BSD version.
-   Copyright (C) 1991, 1992, 1993, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1992, 1993, 1996, 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
@@ -27,6 +27,10 @@
 #define	SIG_DFL	((__sighandler_t) 0) /* Default action.  */
 #define	SIG_IGN	((__sighandler_t) 1) /* Ignore signal.  */
 
+#ifdef __USE_UNIX98
+# define SIG_HOLD      ((__sighandler_t) 2)    /* Add signal to hold mask.  */
+#endif
+
 
 /* Signals.  */
 #define	SIGHUP		1	/* Hangup (POSIX).  */
diff --git a/sysdeps/unix/bsd/getpt.c b/sysdeps/unix/bsd/getpt.c
index cb47692fdd..3bc34b1814 100644
--- a/sysdeps/unix/bsd/getpt.c
+++ b/sysdeps/unix/bsd/getpt.c
@@ -57,4 +57,4 @@ __getpt ()
   __set_errno (ENFILE);
   return -1;
 }
-weak_alias (getpt, __getpt)
+weak_alias (__getpt, getpt)
diff --git a/sysdeps/unix/bsd/ulimit.c b/sysdeps/unix/bsd/ulimit.c
index 4a242efe1c..5fb3d4063e 100644
--- a/sysdeps/unix/bsd/ulimit.c
+++ b/sysdeps/unix/bsd/ulimit.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1994, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 94, 96, 97, 98 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
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <sysdep.h>
+#include <ulimit.h>
 #include <unistd.h>
 #include <sys/resource.h>