diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-01-16 22:32:12 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-01-16 22:32:12 -0500 |
| commit | b998431a33db2be0246f176ea0077b98d5258866 (patch) | |
| tree | d03935b5fbc9e8f6327af93b2897fc1f34d931fe /src/win32 | |
| parent | 8b62a738b3add64dcd26a82dff44a7e9e11ff5a9 (diff) | |
| parent | b7cf7bd9ae31aeddd03ad2094dd480d2b1d34d4f (diff) | |
| download | tor-b998431a33db2be0246f176ea0077b98d5258866.tar.gz tor-b998431a33db2be0246f176ea0077b98d5258866.zip | |
Merge branch '024_msvc_squashed'
Conflicts:
src/or/or.h
srcwin32/orconfig.h
Diffstat (limited to 'src/win32')
| -rw-r--r-- | src/win32/orconfig.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 1d7a5f6fe9..485590f11d 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -247,5 +247,6 @@ #define RSHIFT_DOES_SIGN_EXTEND #define FLEXIBLE_ARRAY_MEMBER 0 #define HAVE_EVENT2_EVENT_H -#define HAVE_EVENT_BASE_LOOPEXIT #define SHARE_DATADIR "" +#define HAVE_EVENT2_DNS_H +#define HAVE_EVENT_BASE_LOOPEXIT |