diff options
| author |   Roland McGrath <roland@gnu.org> | 1995-09-21 06:24:21 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1995-09-21 06:24:21 +0000 |
| commit | 0324daa0055227fdb157b8491d4e5bbe9d9d579a (patch) | |
| tree | 1cc1994ae9fa52ba09e28498b50911628f366add /sysvipc/sys/shm.h | |
| parent | Wed Sep 20 18:02:03 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> (diff) | |
| download | glibc-0324daa0055227fdb157b8491d4e5bbe9d9d579a.tar.gz glibc-0324daa0055227fdb157b8491d4e5bbe9d9d579a.tar.bz2 glibc-0324daa0055227fdb157b8491d4e5bbe9d9d579a.zip | |
Thu Sep 21 00:03:53 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* sysdeps/stub/sys/sem_buf.h (union semun): New type.
* sysdeps/mach/hurd/i386/init-first.c (init1) [PIC]: Call
__libc_global_ctors.
* sysdeps/i386/init-first.c: Rewritten.
* sysdeps/unix/sysv/linux/i386/init-first.S: File removed.
* sysdeps/unix/sysv/linux/i386/init-first.c: New file.
* sysdeps/unix/sysv/linux/i386/fpu_control.h: Fix name in decl of
___fpu_control.
* Makerules (build-shlib): New canned sequence, broken out of
lib%.so rule. Link in $^ instead of just $<.
(lib%.so: lib%_pic.a): Use it.
(libc.so): New target; use $(build-shlib) for cmds, but also depend
on soinit.so first and sofini.so last.
* elf/soinit.c: New file.
* elf/sofini.c: New file.
* elf/Makefile (distribute): Add soinit.c and sofini.c.
(extra-objs): Add soinit.so and sofini.so.
* sysvipc/sys/shm.h (shmat): Fix return type to char *.
* sysdeps/stub/sys/ipc_buf.h (key_t): Type removed.
* misc/syslog.c (vsyslog): Rewritten using open_memstream to
dynamically allocate buffers.
* Makerules (install-lib-nosubdir): Make this, rather than
install-no-libc.a, depend on the installed shared libraries.
Diffstat (limited to 'sysvipc/sys/shm.h')
| -rw-r--r-- | sysvipc/sys/shm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysvipc/sys/shm.h b/sysvipc/sys/shm.h index 11f9e7aa07..9ee61e4a1b 100644 --- a/sysvipc/sys/shm.h +++ b/sysvipc/sys/shm.h @@ -46,7 +46,7 @@ extern int shmctl __P ((int __shmid, int __cmd, struct shmid_ds *__buf)); extern int shmget __P ((key_t __key, int __size, int __shmflg)); /* Attach shared memory segment. */ -extern int shmat __P ((int __shmid, char *__shmaddr, int __shmflg)); +extern char *shmat __P ((int __shmid, char *__shmaddr, int __shmflg)); /* Detach shared memory segment. */ extern int shmdt __P ((char *__shmaddr)); |