diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-06-14 11:46:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-06-14 11:46:38 -0400 |
| commit | a7cafb1ea9307864c94ad3e019af93d09d48350e (patch) | |
| tree | 1c6cc26fb0a93f46d839b3cb46855c93aca135f4 /src/or/or.h | |
| parent | a58d94fb7c6c304ecba930eaa7ebbade1d0686ab (diff) | |
| parent | e07d328457b26babe89abdcc1d5a550ee8273462 (diff) | |
| download | tor-a7cafb1ea9307864c94ad3e019af93d09d48350e.tar.gz tor-a7cafb1ea9307864c94ad3e019af93d09d48350e.zip | |
Merge branch 'bug8746_v2_squashed'
Conflicts:
src/common/include.am
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/or/or.h b/src/or/or.h index f1d68b766e..131bce3e11 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -42,9 +42,6 @@ #include <sys/param.h> /* FreeBSD needs this to know what version it is */ #endif #include "torint.h" -#ifdef HAVE_SYS_WAIT_H -#include <sys/wait.h> -#endif #ifdef HAVE_SYS_FCNTL_H #include <sys/fcntl.h> #endif |