Only in .: .deps
Common subdirectories: ../../squid-3.1.8/src/DiskIO and ./DiskIO
Only in .: Makefile
diff -u ../../squid-3.1.8/src/Makefile.in ./Makefile.in
--- ../../squid-3.1.8/src/Makefile.in	Sat Sep  4 04:26:26 2010
+++ ./Makefile.in	Mon Oct 11 11:39:08 2010
@@ -174,7 +174,8 @@
 	ClientRequestContext.h clientStream.cc clientStream.h CommIO.h \
 	CompletionDispatcher.cc CompletionDispatcher.h comm_select.cc \
 	comm_select.h comm_select_win32.cc comm_poll.cc comm_poll.h \
-	comm_epoll.cc comm_epoll.h comm_kqueue.cc comm_kqueue.h \
+	comm_epoll.cc comm_epoll.h comm_devpoll.cc \
+	comm_kqueue.cc comm_kqueue.h \
 	CommRead.h ConfigOption.cc ConfigParser.cc ConfigParser.h \
 	ConnectionDetail.h debug.cc Debug.h defines.h CommonPool.h \
 	CompositePoolNode.h delay_pools.cc DelayId.cc DelayId.h \
@@ -230,7 +231,8 @@
 	LoadableModule.cc LoadableModules.h LoadableModules.cc
 am__objects_4 = AclRegs.$(OBJEXT) AuthReg.$(OBJEXT)
 am__objects_5 = comm_select.$(OBJEXT) comm_select_win32.$(OBJEXT) \
-	comm_poll.$(OBJEXT) comm_epoll.$(OBJEXT) comm_kqueue.$(OBJEXT)
+	comm_poll.$(OBJEXT) comm_epoll.$(OBJEXT) comm_devpoll.$(OBJEXT) \
+	comm_kqueue.$(OBJEXT)
 am__objects_6 = delay_pools.$(OBJEXT) DelayId.$(OBJEXT) \
 	DelayBucket.$(OBJEXT) DelayConfig.$(OBJEXT) \
 	DelayPool.$(OBJEXT) DelaySpec.$(OBJEXT) DelayTagged.$(OBJEXT) \
@@ -397,7 +399,8 @@
 	client_db.cc client_side.cc client_side_reply.cc \
 	client_side_request.cc ClientInfo.h clientStream.cc \
 	comm_select.cc comm_select.h comm_select_win32.cc comm_poll.cc \
-	comm_poll.h comm_epoll.cc comm_epoll.h comm_kqueue.cc \
+	comm_poll.h comm_epoll.cc comm_epoll.h comm_devpoll.cc \
+	comm_kqueue.cc \
 	comm_kqueue.h ConfigOption.cc ConfigParser.cc CommonPool.h \
 	CompositePoolNode.h delay_pools.cc DelayId.cc DelayId.h \
 	DelayIdComposite.h DelayBucket.cc DelayBucket.h DelayConfig.cc \
@@ -622,7 +625,8 @@
 	client_side_reply.cc client_side_request.cc ClientInfo.h \
 	clientStream.cc comm_select.cc comm_select.h \
 	comm_select_win32.cc comm_poll.cc comm_poll.h comm_epoll.cc \
-	comm_epoll.h comm_kqueue.cc comm_kqueue.h ConfigOption.cc \
+	comm_epoll.h comm_devpoll.cc \
+	comm_kqueue.cc comm_kqueue.h ConfigOption.cc \
 	ConfigParser.cc CommonPool.h CompositePoolNode.h \
 	delay_pools.cc DelayId.cc DelayId.h DelayIdComposite.h \
 	DelayBucket.cc DelayBucket.h DelayConfig.cc DelayConfig.h \
@@ -716,7 +720,8 @@
 	client_side_reply.cc client_side_request.cc ClientInfo.h \
 	clientStream.cc comm_select.cc comm_select.h \
 	comm_select_win32.cc comm_poll.cc comm_poll.h comm_epoll.cc \
-	comm_epoll.h comm_kqueue.cc comm_kqueue.h ConfigOption.cc \
+	comm_epoll.h comm_devpoll.cc \
+	comm_kqueue.cc comm_kqueue.h ConfigOption.cc \
 	ConfigParser.cc CommonPool.h CompositePoolNode.h \
 	delay_pools.cc DelayId.cc DelayId.h DelayIdComposite.h \
 	DelayBucket.cc DelayBucket.h DelayConfig.cc DelayConfig.h \
@@ -827,7 +832,8 @@
 	client_side_reply.cc client_side_request.cc ClientInfo.h \
 	clientStream.cc comm_select.cc comm_select.h \
 	comm_select_win32.cc comm_poll.cc comm_poll.h comm_epoll.cc \
-	comm_epoll.h comm_kqueue.cc comm_kqueue.h ConfigOption.cc \
+	comm_epoll.h comm_devpoll.cc \
+	comm_kqueue.cc comm_kqueue.h ConfigOption.cc \
 	ConfigParser.cc CommonPool.h CompositePoolNode.h \
 	delay_pools.cc DelayId.cc DelayId.h DelayIdComposite.h \
 	DelayBucket.cc DelayBucket.h DelayConfig.cc DelayConfig.h \
@@ -1011,7 +1017,8 @@
 	client_side_reply.cc client_side_request.cc ClientInfo.h \
 	clientStream.cc comm_select.cc comm_select.h \
 	comm_select_win32.cc comm_poll.cc comm_poll.h comm_epoll.cc \
-	comm_epoll.h comm_kqueue.cc comm_kqueue.h ConfigOption.cc \
+	comm_epoll.h comm_devpoll.cc \
+	comm_kqueue.cc comm_kqueue.h ConfigOption.cc \
 	ConfigParser.cc CommonPool.h CompositePoolNode.h \
 	delay_pools.cc DelayId.cc DelayId.h DelayIdComposite.h \
 	DelayBucket.cc DelayBucket.h DelayConfig.cc DelayConfig.h \
@@ -1145,7 +1152,8 @@
 	client_side_reply.cc client_side_request.cc ClientInfo.h \
 	clientStream.cc comm_select.cc comm_select.h \
 	comm_select_win32.cc comm_poll.cc comm_poll.h comm_epoll.cc \
-	comm_epoll.h comm_kqueue.cc comm_kqueue.h ConfigOption.cc \
+	comm_epoll.h comm_devpoll.cc \
+	comm_kqueue.cc comm_kqueue.h ConfigOption.cc \
 	ConfigParser.cc debug.cc CommonPool.h CompositePoolNode.h \
 	delay_pools.cc DelayId.cc DelayId.h DelayIdComposite.h \
 	DelayBucket.cc DelayBucket.h DelayConfig.cc DelayConfig.h \
@@ -1723,6 +1731,7 @@
 	comm_poll.h \
 	comm_epoll.cc \
 	comm_epoll.h \
+	comm_devpoll.cc \
 	comm_kqueue.cc \
 	comm_kqueue.h
 
@@ -3904,6 +3913,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client_side_request.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/comm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/comm_epoll.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/comm_devpoll.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/comm_kqueue.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/comm_poll.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/comm_select.Po@am__quote@
Only in .: Makefile.in.orig
Common subdirectories: ../../squid-3.1.8/src/acl and ./acl
Common subdirectories: ../../squid-3.1.8/src/adaptation and ./adaptation
Common subdirectories: ../../squid-3.1.8/src/auth and ./auth
Common subdirectories: ../../squid-3.1.8/src/base and ./base
Only in .: comm_devpoll.cc
Common subdirectories: ../../squid-3.1.8/src/esi and ./esi
Common subdirectories: ../../squid-3.1.8/src/fs and ./fs
Common subdirectories: ../../squid-3.1.8/src/icmp and ./icmp
Common subdirectories: ../../squid-3.1.8/src/ident and ./ident
Common subdirectories: ../../squid-3.1.8/src/ip and ./ip
Common subdirectories: ../../squid-3.1.8/src/repl and ./repl
Common subdirectories: ../../squid-3.1.8/src/tests and ./tests
diff -u ../../squid-3.1.8/src/unlinkd.cc ./unlinkd.cc
--- ../../squid-3.1.8/src/unlinkd.cc	Sat Sep  4 04:25:57 2010
+++ ./unlinkd.cc	Mon Oct 11 11:39:08 2010
@@ -69,7 +69,7 @@
      * time.
      */
     if (queuelen >= UNLINKD_QUEUE_LIMIT) {
-#if defined(USE_EPOLL) || defined(USE_KQUEUE)
+#if defined(USE_EPOLL) || defined(USE_KQUEUE) || defined(USE_DEVPOLL)
         /*
          * DPW 2007-04-23
          * We can't use fd_set when using epoll() or kqueue().  In