diff options
author | Richard Lowe <richlowe@richlowe.net> | 2011-09-25 05:29:49 +0100 |
---|---|---|
committer | Richard Lowe <richlowe@richlowe.net> | 2011-09-25 05:29:49 +0100 |
commit | d322ce9e5e9bb437d93bf09b5354eede23491de7 (patch) | |
tree | 7a3cc5a877d01d51391e9f27a5a929aae8eda1e3 /usr/src/uts/common/syscall/pipe.c | |
parent | 2408d5be4d43f2c643cbcf11db3a58722a9153b2 (diff) | |
parent | 2807a6ec36a80c58154d9929cf429e8d6100f20a (diff) | |
download | illumos-joyent-d322ce9e5e9bb437d93bf09b5354eede23491de7.tar.gz |
Merge remote-tracking branch 'illumos/master' into gcc/upgrade
Conflicts:
usr/src/common/dis/i386/dis_tables.c
Diffstat (limited to 'usr/src/uts/common/syscall/pipe.c')
-rw-r--r-- | usr/src/uts/common/syscall/pipe.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/usr/src/uts/common/syscall/pipe.c b/usr/src/uts/common/syscall/pipe.c index 7721cd2764..a626b2364a 100644 --- a/usr/src/uts/common/syscall/pipe.c +++ b/usr/src/uts/common/syscall/pipe.c @@ -21,14 +21,13 @@ /* * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2011 Bayard G. Bell. All rights reserved. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" /* from SVr4.0 1.11 */ - #include <sys/types.h> #include <sys/sysmacros.h> #include <sys/param.h> @@ -49,8 +48,6 @@ #include <sys/modctl.h> #include <sys/syscall.h> -char _depends_on[] = "fs/fifofs"; - longlong_t pipe(); static struct sysent pipe_sysent = { |