git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
um
/
drivers
/
slirp_user.c
diff --git
a/arch/um/drivers/slirp_user.c
b/arch/um/drivers/slirp_user.c
index
e95fcab
..
edb45d9
100644
(file)
--- a/
arch/um/drivers/slirp_user.c
+++ b/
arch/um/drivers/slirp_user.c
@@
-4,7
+4,7
@@
#include <stddef.h>
#include <sched.h>
#include <string.h>
#include <stddef.h>
#include <sched.h>
#include <string.h>
-#include <errno.h>
+#include <
sys/
errno.h>
#include <sys/wait.h>
#include <sys/signal.h>
#include "user_util.h"
#include <sys/wait.h>
#include <sys/signal.h>
#include "user_util.h"
@@
-113,13
+113,13
@@
static void slirp_close(int fd, void *data)
}
#endif
}
#endif
-
CATCH_EINTR(err = waitpid(pri->pid, &status, WNOHANG)
);
- if(err
<
0) {
+
err = waitpid(pri->pid, &status, WNOHANG
);
+ if(err
<
0) {
printk("slirp_close: waitpid returned %d\n", errno);
return;
}
printk("slirp_close: waitpid returned %d\n", errno);
return;
}
- if(err
==
0) {
+ if(err
==
0) {
printk("slirp_close: process %d has not exited\n");
return;
}
printk("slirp_close: process %d has not exited\n");
return;
}