diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-05-30 16:19:01 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-05-30 16:19:01 +0000 |
| commit | 9ca7a3a3d6be5741095b3ba2c7e1c979f66628cb (patch) | |
| tree | 62fa9d7334725b21b943f597aa904b7b18bae439 /WIN32-Code | |
| parent | 2deb3ce061adffccbacff6b87401134c4047b8b3 (diff) | |
| download | libevent-9ca7a3a3d6be5741095b3ba2c7e1c979f66628cb.tar.gz | |
Resolve two conflicts.
svn:r839
Diffstat (limited to 'WIN32-Code')
| -rw-r--r-- | WIN32-Code/event-config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WIN32-Code/event-config.h b/WIN32-Code/event-config.h index a14c8b34..30590802 100644 --- a/WIN32-Code/event-config.h +++ b/WIN32-Code/event-config.h @@ -51,7 +51,7 @@ /* #undef _EVENT_HAVE_INET_NTOP */ /* Define to 1 if you have the <inttypes.h> header file. */ -/* #define _EVENT_HAVE_INTTYPES_H 1 */ +/* #undef _EVENT_HAVE_INTTYPES_H 1 */ /* Define to 1 if you have the `kqueue' function. */ /* #undef _EVENT_HAVE_KQUEUE */ |