- (djm) Merged cleanup patch from Mark Miller <markm@swoon.net>

 - (djm) A bit more cleanup - created cygwin_util.h

1 files changed, 10 insertions, 10 deletions

diff --git a/next-posix.h b/next-posix.h
index 077b132e4..fc06e41bc 100644
--- a/next-posix.h
+++ b/next-posix.h
@@ -10,7 +10,7 @@
 #include <sys/dir.h>
 
 /* readdir() returns struct direct (BSD) not struct dirent (POSIX) */
-#define dirent direct                                                
+#define dirent direct
 
 /* POSIX utime() struct */
 struct utimbuf {
@@ -19,7 +19,7 @@ struct utimbuf {
 };
 
 /* FILE */
-#define O_NONBLOCK      00004   /* non-blocking open */
+#define O_NONBLOCK      00004   /* non-blocking open */
 
 /* WAITPID */
 #undef WIFEXITED
@@ -29,8 +29,8 @@ struct utimbuf {
 #define WIFEXITED(w)    (!((w) & 0377))
 #define WIFSTOPPED(w)   ((w) & 0100)
 #define WIFSIGNALED(w)  (!WIFEXITED(w) && !WIFSTOPPED(w))
-#define WEXITSTATUS(w)  (int)(WIFEXITED(w) ? ((w >> 8) & 0377) : -1)
-#define WTERMSIG(w)     (int)(WIFSIGNALED(w) ? (w & 0177) : -1)
+#define WEXITSTATUS(w)  (int)(WIFEXITED(w) ? (((w) >> 8) & 0377) : -1)
+#define WTERMSIG(w)     (int)(WIFSIGNALED(w) ? ((w) & 0177) : -1)
 #define WCOREFLAG       0x80
 #define WCOREDUMP(w)    ((w) & WCOREFLAG)
 
@@ -42,17 +42,17 @@ pid_t posix_wait(int *status);				/* new wait() */
 #define wait posix_wait 
 
 /* MISC functions */
-int waitpid(int pid,int *stat_loc,int options);
+int waitpid(int pid, int *stat_loc, int options);
 pid_t setsid(void);
 
-/* TC */
-int tcgetattr(int fd,struct termios *t);
-int tcsetattr(int fd,int opt,const struct termios *t);
+/* TERMCAP */
+int tcgetattr(int fd, struct termios *t);
+int tcsetattr(int fd, int opt, const struct termios *t);
 int tcsetpgrp(int fd, pid_t pgrp);
 speed_t cfgetospeed(const struct termios *t);
 speed_t cfgetispeed(const struct termios *t);
-int cfsetospeed(struct termios *t,int speed);
-
+int cfsetospeed(struct termios *t, int speed);
 
 #endif /* HAVE_NEXT */
+
 #endif /* _NEXT_POSIX_H */