about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1996-11-29 02:24:43 +0000
committerUlrich Drepper <drepper@redhat.com>1996-11-29 02:24:43 +0000
commita401eea9eb827caa393c3206fa6f3939ea067e94 (patch)
tree00c4ab2ea24a7556b9d1e7a809743aa421ee5188
parentc66452515d7b4ebf6b0633735397db9a392a839e (diff)
downloadglibc-a401eea9eb827caa393c3206fa6f3939ea067e94.tar.gz
glibc-a401eea9eb827caa393c3206fa6f3939ea067e94.tar.xz
glibc-a401eea9eb827caa393c3206fa6f3939ea067e94.zip
update from main archive 961127 cvs/libc-961201 cvs/libc-961130 cvs/libc-961129
Thu Nov 28 23:03:32 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/netinet/in_systm.h: New file.
	* sysdeps/unix/sysv/linux/Dist: Add netinet/in_systm.h.
	* sysdeps/unix/sysv/linux/Makefile [$(subdir)=inet] (sysdep_headers):
	Add netinet/in_systm.h.
	Reported by NIIBE Yutaka <gniibe@mri.co.jp>.

	* sysdeps/unix/sysv/linux/i386/brk.c: Reformat copyright.
-rw-r--r--ChangeLog10
-rw-r--r--login/getutent_r.c17
-rw-r--r--sysdeps/unix/sysv/linux/Dist1
-rw-r--r--sysdeps/unix/sysv/linux/Makefile4
-rw-r--r--sysdeps/unix/sysv/linux/m68k/syscalls.list3
-rw-r--r--sysdeps/unix/sysv/linux/netinet/in_systm.h1
6 files changed, 28 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index cac800e9df..4958fa02a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Nov 28 23:03:32 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/unix/sysv/linux/netinet/in_systm.h: New file.
+	* sysdeps/unix/sysv/linux/Dist: Add netinet/in_systm.h.
+	* sysdeps/unix/sysv/linux/Makefile [$(subdir)=inet] (sysdep_headers):
+	Add netinet/in_systm.h.
+	Reported by NIIBE Yutaka <gniibe@mri.co.jp>.
+
 Thu Nov 28 03:11:11 1996  Ulrich Drepper  <drepper@cygnus.com>
 
 	* libio/fileops.c: Update from latest libg++.
@@ -9,7 +17,7 @@ Thu Nov 28 03:11:11 1996  Ulrich Drepper  <drepper@cygnus.com>
 	instead of __libc_lock_init for streams.
 	Reported by a sun <asun@zoology.washington.edu>.
 
-	* sysdepsunix/sysv/linux/i386/brk.c: Reformat copyright.
+	* sysdeps/unix/sysv/linux/i386/brk.c: Reformat copyright.
 
 	* sysdeps/generic/errno-loc.c: New file.  Generic definition of
 	__errno_location function.
diff --git a/login/getutent_r.c b/login/getutent_r.c
index df9a7977ab..580dcffb21 100644
--- a/login/getutent_r.c
+++ b/login/getutent_r.c
@@ -27,17 +27,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include <utmp.h>
-#include <gnu/lib-names.h>
 #include <sys/stat.h>
 
 #include "utmp-private.h"
-#include "../elf/link.h"
 
 
 /* The various backends we have.  */
 static int __setutent_unknown (int reset);
 static int __getutent_r_unknown (struct utmp *buffer, struct utmp **result);
-static void __pututline_unknown (const struct utmp *data);
+static struct utmp *__pututline_unknown (const struct utmp *data);
 static void __endutent_unknown (void);
 
 
@@ -142,24 +140,29 @@ __getutent_r_unknown (struct utmp *buffer, struct utmp **result)
 }
 
 
-void
+struct utmp *
 __pututline (const struct utmp *data)
 {
+  struct utmp *buffer;
+
   __libc_lock_lock (__libc_utmp_lock);
 
-  (*__libc_utmp_jump_table->pututline) (data);
+  buffer = (*__libc_utmp_jump_table->pututline) (data);
 
   __libc_lock_unlock (__libc_utmp_lock);
+
+  return buffer;
 }
+weak_alias (__pututline, pututline)
 
 
-static void
+static struct utmp *
 __pututline_unknown (const struct utmp *data)
 {
   /* It is not yet initialized.  */
   __setutent_unknown (0);
 
-  (*__libc_utmp_jump_table->pututline) (data);
+  return (*__libc_utmp_jump_table->pututline) (data);
 }
 
 
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index e1a89711e2..3f7d1235e5 100644
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -8,6 +8,7 @@ net/if_ppp.h
 net/ppp-comp.h
 net/ppp_defs.h
 net/route.h
+netinet/in_systm.h
 nfs/nfs.h
 sys/acct.h
 sys/debugreg.h
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index a200064a1c..9e6bd65bd1 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -51,5 +51,9 @@ ifeq ($(subdir), stdio-common)
 inhibit-siglist := yes
 endif
 
+ifeq ($(subdir), inet)
+sysdep_headers += netinet/in_systm.h
+endif
+
 # Don't compile the ctype glue code, since there is no old non-GNU C library.
 inhibit-glue = yes
diff --git a/sysdeps/unix/sysv/linux/m68k/syscalls.list b/sysdeps/unix/sysv/linux/m68k/syscalls.list
new file mode 100644
index 0000000000..7883d70719
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/m68k/syscalls.list
@@ -0,0 +1,3 @@
+# File name	Caller	Syscall name	# args	Strong name	Weak names
+
+s_llseek	llseek	_llseek		5	__sys_llseek
diff --git a/sysdeps/unix/sysv/linux/netinet/in_systm.h b/sysdeps/unix/sysv/linux/netinet/in_systm.h
new file mode 100644
index 0000000000..f481c5511a
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/netinet/in_systm.h
@@ -0,0 +1 @@
+#include <linux/in_systm.h>