diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-11-01 18:12:07 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-11-01 18:12:07 -0400 |
| commit | 2e6a985003cbe10921eef9036c2a7ba5cee5d683 (patch) | |
| tree | 4c1a6108bc8672c17f5b77a5b21aeab200ea4c03 /util-internal.h | |
| parent | 6810908a5fd7d38a5aaec7cceae5a12b372c53c3 (diff) | |
| parent | 94866c2763c51d11354437b48d05c19306e220a9 (diff) | |
| download | libevent-2e6a985003cbe10921eef9036c2a7ba5cee5d683.tar.gz | |
Merge remote-tracking branch 'github/20_win64_compilation' into 21_win64_compilation
Conflicts:
event.c
http.c
sample/event-read-fifo.c
test/regress_bufferevent.c
Diffstat (limited to 'util-internal.h')
| -rw-r--r-- | util-internal.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/util-internal.h b/util-internal.h index 98c81684..da1fb838 100644 --- a/util-internal.h +++ b/util-internal.h @@ -392,6 +392,14 @@ HANDLE evutil_load_windows_system_library_(const TCHAR *library_name); #endif #endif +#ifdef _WIN32 +#define EV_SOCK_FMT EV_I64_FMT +#define EV_SOCK_ARG(x) EV_I64_ARG((x)) +#else +#define EV_SOCK_FMT "%d" +#define EV_SOCK_ARG(x) (x) +#endif + #if defined(__STDC__) && defined(__STDC_VERSION__) #if (__STDC_VERSION__ >= 199901L) #define EV_SIZE_FMT "%zu" |