From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Tue, 2 Aug 2011 08:06:19 +0000 (-0600)
Subject: ev_entry is a C++ class these days, don't attempt using it as a struct
X-Git-Tag: SQUID_3_1_15~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d5cf0899f78cb02d63619e832289425ea2d117d;p=thirdparty%2Fsquid.git

ev_entry is a C++ class these days, don't attempt using it as a struct
---

diff --git a/src/event.cc b/src/event.cc
index 612b8fcd71..1eb69c7e84 100644
--- a/src/event.cc
+++ b/src/event.cc
@@ -238,7 +238,7 @@ int
 EventScheduler::checkEvents(int timeout)
 {
 
-    struct ev_entry *event = NULL;
+    ev_entry *event = NULL;
 
     if (NULL == tasks)
         return checkDelay();
@@ -291,7 +291,7 @@ void
 EventScheduler::dump(StoreEntry * sentry)
 {
 
-    struct ev_entry *e = tasks;
+    ev_entry *e = tasks;
 
     if (last_event_ran)
         storeAppendPrintf(sentry, "Last event to run: %s\n\n", last_event_ran);
@@ -314,7 +314,7 @@ bool
 EventScheduler::find(EVH * func, void * arg)
 {
 
-    struct ev_entry *event;
+    ev_entry *event;
 
     for (event = tasks; event != NULL; event = event->next) {
         if (event->func == func && event->arg == arg)
@@ -337,9 +337,9 @@ EventScheduler::schedule(const char *name, EVH * func, void *arg, double when, i
     // must fire in the submission order. We cannot use current_dtime for them
     // because it may decrease if system clock is adjusted backwards.
     const double timestamp = when > 0.0 ? current_dtime + when : 0;
-    struct ev_entry *event = new ev_entry(name, func, arg, timestamp, weight, cbdata);
+    ev_entry *event = new ev_entry(name, func, arg, timestamp, weight, cbdata);
 
-    struct ev_entry **E;
+    ev_entry **E;
     debugs(41, 7, HERE << "schedule: Adding '" << name << "', in " << when << " seconds");
     /* Insert after the last event with the same or earlier time */