[or-cvs] Revise windows patch; make it use logging code; make it mor...

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/or/cvsroot/libevent
In directory moria.mit.edu:/tmp/cvs-serv3026

Modified Files:
	event.c log.c log.h 
Log Message:
Revise windows patch; make it use logging code; make it more correct.

Index: event.c
===================================================================
RCS file: /home/or/cvsroot/libevent/event.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- event.c	1 Mar 2005 00:22:52 -0000	1.4
+++ event.c	10 Mar 2005 19:32:04 -0000	1.5
@@ -24,9 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifdef WIN32
 #define WIN32_LEAN_AND_MEAN
@@ -38,7 +36,7 @@
 #include <sys/tree.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else 
+#else
 #include <sys/_time.h>
 #endif
 #include <sys/queue.h>

Index: log.c
===================================================================
RCS file: /home/or/cvsroot/libevent/log.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- log.c	1 Mar 2005 00:22:52 -0000	1.1
+++ log.c	10 Mar 2005 19:32:05 -0000	1.2
@@ -37,11 +37,17 @@
  * SUCH DAMAGE.
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <errno.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#else
+#include <sys/_time.h>
+#endif
 #include "event.h"
 
 static void _warn_helper(int severity, int log_errno, const char *fmt,

Index: log.h
===================================================================
RCS file: /home/or/cvsroot/libevent/log.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- log.h	1 Mar 2005 00:22:52 -0000	1.1
+++ log.h	10 Mar 2005 19:32:05 -0000	1.2
@@ -33,7 +33,6 @@
 void event_warnx(const char *fmt, ...);
 void event_msgx(const char *fmt, ...);
 void _event_debugx(const char *fmt, ...);
-#define USE_DEBUG
 #ifdef USE_DEBUG
 #define event_debug(x) _event_debugx x
 #else