Merge remote-tracking branch 'origin/master' into dev_tls

This commit is contained in:
Ben Gräf 2018-02-22 08:36:12 +01:00
commit c5fa48215b
7 changed files with 11 additions and 7 deletions

View file

@ -33,6 +33,7 @@
#include <thread>
#else
#include <sys/wait.h>
#include <errno.h>
#endif
int main(int argc, char **argv) {