SourceFormat Enforcement

[thirdparty/squid.git] / src / event.h

diff --git a/src/event.h b/src/event.h
index 91e9665d5a3b58d087ac3f179b37b1bb4c5494f5..ed66a9e0cf40e55c7c629cc541e14a77276eeb4a 100644 (file)
--- a/src/event.h
+++ b/src/event.h
@@ -1,7 +1,5 @@
 
 /*
- * $Id$
- *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
@@ -34,11 +32,9 @@
 #ifndef SQUID_EVENT_H
 #define SQUID_EVENT_H
 
-#include "squid.h"
-#include "Array.h"
 #include "AsyncEngine.h"
-
-/* forward decls */
+#include "base/Vector.h"
+#include "MemPool.h"
 
 class StoreEntry;
 
@@ -46,12 +42,12 @@ class StoreEntry;
 
 typedef void EVH(void *);
 
-extern void eventAdd(const char *name, EVH * func, void *arg, double when, int, bool cbdata=true);
-SQUIDCEXTERN void eventAddIsh(const char *name, EVH * func, void *arg, double delta_ish, int);
-SQUIDCEXTERN void eventDelete(EVH * func, void *arg);
-SQUIDCEXTERN void eventInit(void);
-SQUIDCEXTERN void eventFreeMemory(void);
-SQUIDCEXTERN int eventFind(EVH *, void *);
+void eventAdd(const char *name, EVH * func, void *arg, double when, int, bool cbdata=true);
+void eventAddIsh(const char *name, EVH * func, void *arg, double delta_ish, int);
+void eventDelete(EVH * func, void *arg);
+void eventInit(void);
+void eventFreeMemory(void);
+int eventFind(EVH *, void *);
 
 class ev_entry
 {