From: wessels <>
Date: Mon, 29 May 2000 07:37:11 +0000 (+0000)
Subject: DW:
X-Git-Tag: SQUID_3_0_PRE1~1958
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=767e4890d5c512811fa46db1f92b7192217dcd9f;p=thirdparty%2Fsquid.git

DW:
 - Must #include store_diskd.h after sys/msg.h in order to pick up
   mytp_t.
---

diff --git a/src/fs/diskd/diskd.cc b/src/fs/diskd/diskd.cc
index 06bdfc5dea..53ff82e718 100644
--- a/src/fs/diskd/diskd.cc
+++ b/src/fs/diskd/diskd.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: diskd.cc,v 1.3 2000/05/29 00:30:44 wessels Exp $
+ * $Id: diskd.cc,v 1.4 2000/05/29 01:37:11 wessels Exp $
  *
  * DEBUG: section --    External DISKD process implementation.
  * AUTHOR: Harvest Derived
@@ -35,13 +35,12 @@
 #include "config.h"
 #include "squid.h"
 
-
-#include "store_diskd.h"
-
 #include <sys/ipc.h>
 #include <sys/msg.h>
 #include <sys/shm.h>
 
+#include "store_diskd.h"
+
 #undef assert
 #include <assert.h>
 
diff --git a/src/fs/diskd/store_io_diskd.cc b/src/fs/diskd/store_io_diskd.cc
index b15b8ba39c..69bfeb0994 100644
--- a/src/fs/diskd/store_io_diskd.cc
+++ b/src/fs/diskd/store_io_diskd.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_io_diskd.cc,v 1.9 2000/05/29 00:36:39 wessels Exp $
+ * $Id: store_io_diskd.cc,v 1.10 2000/05/29 01:37:11 wessels Exp $
  *
  * DEBUG: section 81    Squid-side DISKD I/O functions.
  * AUTHOR: Duane Wessels
@@ -35,12 +35,13 @@
 
 #include "config.h"
 #include "squid.h"
-#include "store_diskd.h"
 
 #include <sys/ipc.h>
 #include <sys/msg.h>
 #include <sys/shm.h>
 
+#include "store_diskd.h"
+
 static int storeDiskdSend(int, SwapDir *, int, storeIOState *, int, int, int);
 static void storeDiskdIOCallback(storeIOState * sio, int errflag);
 static void storeDiskdIOFreeEntry(void *sio, int foo);