diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2018-02-20 21:50:22 -0500 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2018-02-20 21:50:22 -0500 |
| commit | f6d7cfd710de1bf9d4f6eabab45570bc91941ee1 (patch) | |
| tree | 6aed4f8606e47c6ef21c5b1d8bbf7cafa694af6e /lib/server/Daemon.cpp | |
| parent | c81b92946b58b90fe9679a476338e2d2dec8df67 (diff) | |
| parent | f28f88e5e72ba1499409047a9d6985eb312c0232 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'lib/server/Daemon.cpp')
| -rw-r--r-- | lib/server/Daemon.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/server/Daemon.cpp b/lib/server/Daemon.cpp index 836948bf..d3c8441f 100644 --- a/lib/server/Daemon.cpp +++ b/lib/server/Daemon.cpp @@ -9,16 +9,20 @@ #include "Box.h" -#ifdef HAVE_UNISTD_H - #include <unistd.h> -#endif - #include <errno.h> #include <stdio.h> #include <signal.h> #include <string.h> #include <stdarg.h> +#ifdef HAVE_PROCESS_H +# include <process.h> +#endif + +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif + #ifdef HAVE_BSD_UNISTD_H #include <bsd/unistd.h> #endif @@ -26,7 +30,6 @@ #ifdef WIN32 #include <Strsafe.h> #include <ws2tcpip.h> - #include <process.h> #endif #include "depot.h" |