* event.c and event.h: Moved to localevent.c and localevent.h for integration with libevent (which has a default header of event.h)

httperf/ChangeLog

@@ -1,10 +1,15 @@
+2007-06-03  Ted Bullock <tbullock@canada.com>
+
+	* event.c and event.h: Moved to localevent.c and localevent.h for integration with
+	libevent (which has a default header of event.h)
+
 2007-06-03  Ted Bullock <tbullock@canada.com>
 
 	* configure.ac: Add configuration to use libevent
 
 2007-06-03  Ted Bullock <tbullock@canada.com>
 
-	* configure.ac: Remove unnecessary  configuration cruft and configure httperf
+	* configure.ac: Remove unnecessary configuration cruft and configure httperf
 	to be built in c99 mode
 
 2007-05-27  Ted Bullock <tbullock@canada.com>

httperf/src/Makefile.am

@@ -5,8 +5,8 @@ AM_CFLAGS = -I$(srcdir) -I$(srcdir)/gen -I$(srcdir)/lib -I$(srcdir)/stat
 
 bin_PROGRAMS = httperf idleconn
 httperf_SOURCES = httperf.c httperf.h object.c object.h call.c call.h conn.c \
-  conn.h sess.c sess.h core.c core.h event.c event.h http.c http.h timer.c \
+  conn.h sess.c sess.h core.c core.h localevent.c localevent.h http.c http.h \
-  timer.h
+  timer.c timer.h
 idleconn_SOURCES = idleconn.c
 
 httperf_LDADD = gen/libgen.a lib/libutil.a stat/libstat.a

httperf/src/core.c

@@ -61,7 +61,7 @@
 #include <httperf.h>
 #include <call.h>
 #include <core.h>
-#include <event.h>
+#include <localevent.h>
 #include <http.h>
 #include <conn.h>
 

httperf/src/gen/call_seq.c

@@ -39,7 +39,7 @@
 #include <httperf.h>
 #include <call.h>
 #include <core.h>
-#include <event.h>
+#include <localevent.h>
 #include <conn.h>
 
 #define CONN_PRIVATE_DATA(c) \

httperf/src/gen/conn_rate.c

@@ -40,7 +40,7 @@
 
 #include <httperf.h>
 #include <core.h>
-#include <event.h>
+#include <localevent.h>
 #include <rate.h>
 #include <conn.h>
 #include <timer.h>

httperf/src/gen/misc.c

@@ -50,7 +50,7 @@
 
 #include <httperf.h>
 #include <call.h>
-#include <event.h>
+#include <localevent.h>
 
 static const char *extra;
 static size_t extra_len;

httperf/src/gen/rate.c

@@ -37,7 +37,7 @@
 #include <stdlib.h>
 
 #include <httperf.h>
-#include <event.h>
+#include <localevent.h>
 #include <object.h>
 #include <rate.h>
 #include <timer.h>

httperf/src/gen/sess_cookie.c

@@ -51,7 +51,7 @@
 #include <call.h>
 #include <conn.h>
 #include <core.h>
-#include <event.h>
+#include <localevent.h>
 #include <session.h>
 
 #define MAX_COOKIE_LEN	256

httperf/src/gen/session.c

@@ -69,7 +69,7 @@
 #include <call.h>
 #include <conn.h>
 #include <core.h>
-#include <event.h>
+#include <localevent.h>
 #include <sess.h>
 #include <session.h>
 

httperf/src/gen/uri_fixed.c

@@ -41,7 +41,7 @@
 
 #include <httperf.h>
 #include <call.h>
-#include <event.h>
+#include <localevent.h>
 
 static size_t uri_len;
 

httperf/src/gen/uri_wlog.c

@@ -80,7 +80,7 @@
 #include <httperf.h>
 #include <call.h>
 #include <core.h>
-#include <event.h>
+#include <localevent.h>
 
 static char *fbase, *fend, *fcurrent;
 

httperf/src/gen/uri_wset.c

@@ -42,7 +42,7 @@
 
 #include <httperf.h>
 #include <call.h>
-#include <event.h>
+#include <localevent.h>
 
 #define MAX_URI_LEN		128
 #define CALL_PRIVATE_DATA(c) \

httperf/src/gen/wsess.c

@@ -45,7 +45,7 @@
 #include <call.h>
 #include <conn.h>
 #include <core.h>
-#include <event.h>
+#include <localevent.h>
 #include <rate.h>
 #include <session.h>
 #include <timer.h>

httperf/src/gen/wsesslog.c

@@ -83,7 +83,7 @@
 #include <httperf.h>
 #include <conn.h>
 #include <core.h>
-#include <event.h>
+#include <localevent.h>
 #include <rate.h>
 #include <session.h>
 #include <timer.h>

httperf/src/gen/wsesspage.c

@@ -50,7 +50,7 @@
 #include <call.h>
 #include <conn.h>
 #include <core.h>
-#include <event.h>
+#include <localevent.h>
 #include <rate.h>
 #include <session.h>
 #include <timer.h>

httperf/src/http.c

@@ -44,7 +44,7 @@
 #include <httperf.h>
 #include <http.h>
 #include <call.h>
-#include <event.h>
+#include <localevent.h>
 #include <conn.h>
 
 /* Read a CRLF terminated line of characters into c->reply.line.

httperf/src/httperf.c

@@ -73,7 +73,7 @@
 #include <sys/resource.h>
 
 #include <core.h>
-#include <event.h>
+#include <localevent.h>
 #include <httperf.h>
 #include <conn.h>
 #include <timer.h>

httperf/src/object.c

@@ -41,7 +41,7 @@
 #include <httperf.h>
 #include <call.h>
 #include <conn.h>
-#include <event.h>
+#include <localevent.h>
 #include <object.h>
 #include <sess.h>
 

httperf/src/sess.c

@@ -32,7 +32,7 @@
     02110-1301, USA
 */
 #include <httperf.h>
-#include <event.h>
+#include <localevent.h>
 #include <sess.h>
 
 void

httperf/src/stat/basic.c

@@ -43,7 +43,7 @@
 
 #include <httperf.h>
 #include <call.h>
-#include <event.h>
+#include <localevent.h>
 #include <stats.h>
 
 /* Increase this if it does not cover at least 50% of all response

httperf/src/stat/print_reply.c

@@ -43,7 +43,7 @@
 #include <httperf.h>
 #include <call.h>
 #include <conn.h>
-#include <event.h>
+#include <localevent.h>
 
 typedef struct Call_Private_Data
   {

httperf/src/stat/sess_stat.c

@@ -42,7 +42,7 @@
 
 #include <httperf.h>
 #include <call.h>
-#include <event.h>
+#include <localevent.h>
 #include <session.h>
 #include <stats.h>