Resolve two conflicts.

svn:r839

diff --git a/ChangeLog b/ChangeLog
index d02f498f60d4c05fb13658e34d205d97ce1c5af1..16ec4595562a5a356226191e50b9429724d3aca9 100644 (file)
--- 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 a14c8b3423fba030f969ec97fb199c3be710b213..3059080274b5f95b032dcd332cd8f212964b3908 100644 (file)
--- 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 */