diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-05-06 17:51:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 15:13:01 -0400 |
| commit | 24fa6c0832f4513ac897082d7d803970a40cc1b0 (patch) | |
| tree | 261c0b7612f74b703ce88efb7dd22548779e1399 /arch/um/drivers/pty.c | |
| parent | 4ff83ce1114827f707b7f1f4f2e5f69de9df94ac (diff) | |
uml: move remaining useful contents of user_util.h
Rescue the useful contents of the soon-to-be-gone user-util.h.
pty.c now gets ptsname from stdlib.h like it should have always done.
CATCH_EINTR is now in os.h, although perhaps all usage should be under
os-Linux at some point.
get_pty is also in os.h.
This patch restores the old definition of ARRAY_SIZE in user.h. This file is
included only in userspace files, so there will be no conflict with the
kernel's new ARRAY_SIZE. The copy of the kernel's ARRAY_SIZE and associated
infrastructure is now gone.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/drivers/pty.c')
| -rw-r--r-- | arch/um/drivers/pty.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/drivers/pty.c b/arch/um/drivers/pty.c index 829a5eca8c07..aa311afa9667 100644 --- a/arch/um/drivers/pty.c +++ b/arch/um/drivers/pty.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <stdio.h> | 6 | #include <stdio.h> |
| 7 | #include <stdlib.h> | ||
| 7 | #include <unistd.h> | 8 | #include <unistd.h> |
| 8 | #include <string.h> | 9 | #include <string.h> |
| 9 | #include <errno.h> | 10 | #include <errno.h> |