diff options
author | 2015-09-08 18:41:17 -0400 | |
---|---|---|
committer | 2015-09-08 18:41:17 -0400 | |
commit | 60e901aabaeab7d205da65030849056c05c8b73e (patch) | |
tree | 20883ed8ae63c326f3c042992e8dbe668656568e /scripts/external_libs/zmq/utils/getpid_compat.h | |
parent | 9a524989d331f04abecd3faa72d98157a8651739 (diff) | |
parent | 463cb7c212e927a732fb5b702a288a06550c5eb8 (diff) |
Merge remote-tracking branch
Conflicts:
linux/b
linux/ws_main.py
linux_dpdk/ws_main.py
src/bp_sim.h
Diffstat (limited to 'scripts/external_libs/zmq/utils/getpid_compat.h')
-rw-r--r-- | scripts/external_libs/zmq/utils/getpid_compat.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/external_libs/zmq/utils/getpid_compat.h b/scripts/external_libs/zmq/utils/getpid_compat.h new file mode 100644 index 00000000..47ce90fa --- /dev/null +++ b/scripts/external_libs/zmq/utils/getpid_compat.h @@ -0,0 +1,6 @@ +#ifdef _WIN32 + #include <process.h> + #define getpid _getpid +#else + #include <unistd.h> +#endif |