From 9ca7a3a3d6be5741095b3ba2c7e1c979f66628cb Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 30 May 2008 16:19:01 +0000 Subject: [PATCH] Resolve two conflicts. svn:r839 --- ChangeLog | 3 ++- WIN32-Code/event-config.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d02f498f..16ec4595 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,7 +103,8 @@ Changes in current version: o Fix use of freed memory in event_reinit; pointed out by Peter Postma o constify struct timeval * where possible o make event_get_supported_methods obey environment variables - + + Changes in 1.4.0: o allow \r or \n individually to separate HTTP headers instead of the standard "\r\n"; from Charles Kerr. o demote most http warnings to debug messages 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 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 */