diff --git a/LibC/stdlib.cpp b/LibC/stdlib.cpp index 74d7d07939..3f4b64329c 100644 --- a/LibC/stdlib.cpp +++ b/LibC/stdlib.cpp @@ -1,19 +1,20 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include +#include +#include #include #include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include extern "C" { diff --git a/LibC/sys/wait.h b/LibC/sys/wait.h index c9d9e960aa..3fedd42b2c 100644 --- a/LibC/sys/wait.h +++ b/LibC/sys/wait.h @@ -5,7 +5,17 @@ __BEGIN_DECLS +#define WEXITSTATUS(status) (((status)&0xff00) >> 8) +#define WTERMSIG(status) ((status)&0x7f) +#define WIFEXITED(status) (WTERMSIG(status) == 0) +#define WIFSIGNALED(status) (((char)(((status)&0x7f) + 1) >> 1) > 0) + #define WNOHANG 1 +#define WUNTRACED 2 +#define WSTOPPED WUNTRACED +#define WEXITED 4 +#define WCONTINUED 8 + pid_t wait(int* wstatus); __END_DECLS diff --git a/LibC/unistd.h b/LibC/unistd.h index 0ea910c299..a935330a6d 100644 --- a/LibC/unistd.h +++ b/LibC/unistd.h @@ -95,11 +95,6 @@ enum _PC_NAME_MAX, }; -#define WEXITSTATUS(status) (((status)&0xff00) >> 8) -#define WTERMSIG(status) ((status)&0x7f) -#define WIFEXITED(status) (WTERMSIG(status) == 0) -#define WIFSIGNALED(status) (((char)(((status)&0x7f) + 1) >> 1) > 0) - #define HOST_NAME_MAX 64 #define R_OK 4 diff --git a/Shell/main.cpp b/Shell/main.cpp index 47a2bc2ef9..d5f1bab4a8 100644 --- a/Shell/main.cpp +++ b/Shell/main.cpp @@ -1,21 +1,22 @@ +#include "GlobalState.h" +#include "LineEditor.h" +#include "Parser.h" +#include +#include +#include #include +#include #include #include #include #include #include -#include -#include -#include #include #include #include -#include -#include -#include -#include "GlobalState.h" -#include "Parser.h" -#include "LineEditor.h" +#include +#include +#include //#define SH_DEBUG