SourceFormat Enforcement

[thirdparty/squid.git] / compat / compat.h

diff --git a/compat/compat.h b/compat/compat.h
index e1de846f5b6dc60b7577e654faf645ecd7a6eab4..6cb68d5423aefb3fa4f5b5204626d974c57a1126 100644 (file)
--- a/compat/compat.h
+++ b/compat/compat.h
@@ -8,14 +8,13 @@
  *
  * This file is meant to collate all those hacks files together and
  * provide a simple include for them in the core squid headers
- * (presently squid.h and config.h)
+ * (presently squid.h)
  *
  * It should not be included directly in any of the squid sources.
  * If your code requires any symbols from here you should be importing
- * config.h/squid.h at the top line of your .cc or .h file.
+ * squid.h at the top line of your .cc file.
  */
 
-
 /******************************************************/
 /* Define the _SQUID_TYPE_ based on a guess of the OS */
 /* NP: this MUST come first within compat.h           */
@@ -35,15 +34,12 @@
 #endif
 #endif
 
-
-
 /*****************************************************/
 /* FDSETSIZE is messy and needs to be done before    */
 /* sys/types.h are defined.                          */
 /*****************************************************/
 #include "compat/fdsetsize.h"
 
-
 /*****************************************************/
 /* Global type re-definitions                        */
 /* this also takes care of the basic system includes */
@@ -76,7 +72,6 @@
 #include "compat/os/sunos.h"
 #include "compat/os/windows.h"
 
-
 /*****************************************************/
 /* portabilities shared between all platforms and    */
 /* components as found to be needed                  */
@@ -89,7 +84,6 @@
 /* cstdio has a bunch of problems with 64-bit definitions */
 #include "compat/stdio.h"
 
-
 /*****************************************************/
 /* component-specific portabilities                  */
 /*****************************************************/
@@ -113,4 +107,7 @@
 /* some functions are unsafe to be used in Squid. */
 #include "compat/unsafe.h"
 
+/* cppunit is not quite C++0x compatible yet */
+#include "compat/cppunit.h"
+
 #endif /* _SQUID_COMPAT_H */