Trim squid_ from compat filenames

diff --git a/libsquid-compat/Makefile.am b/libsquid-compat/Makefile.am
index 9565d4ecfe4de07ba43338809c4346dc9ddd03b1..0366b74c8a2f48c5a8e4bf8d3f46405938872d93 100644 (file)
--- a/libsquid-compat/Makefile.am
+++ b/libsquid-compat/Makefile.am
@@ -28,23 +28,23 @@ libsquid_compat_la_SOURCES = \
        compat.h \
        osdetect.h \
        compat_shared.h \
+       fdsetsize.h \
        gnuregex.h \
-       squid_fdsetsize.h \
-       squid_stdvarargs.h \
-       squid_valgrind.h \
+       stdvarargs.h \
+       valgrind.h \
        \
-       os/squid_aix.h \
-       os/squid_freebsd.h \
-       os/squid_hpux.h \
-       os/squid_linux.h \
-       os/squid_mswin.h \
-       os/squid_next.h \
-       os/squid_openbsd.h \
-       os/squid_qnx.h \
-       os/squid_sgi.h \
-       os/squid_solaris.h \
-       os/squid_sunos.h \
-       os/squid_windows.h \
+       os/aix.h \
+       os/freebsd.h \
+       os/hpux.h \
+       os/linux.h \
+       os/mswin.h \
+       os/next.h \
+       os/openbsd.h \
+       os/qnx.h \
+       os/sgi.h \
+       os/solaris.h \
+       os/sunos.h \
+       os/windows.h \
        \
        compat.cc \
        GnuRegex.c

diff --git a/libsquid-compat/assert.h b/libsquid-compat/assert.h
index 6ad63dcf474e5c84da563824703d2402cd9b2c70..1bad0a026f20527d15740855d2b09d0fa82dc04e 100644 (file)
--- a/libsquid-compat/assert.h
+++ b/libsquid-compat/assert.h
@@ -45,6 +45,12 @@
 #else
 #define assert(EX)  ((EX)?((void)0):xassert("EX", __FILE__, __LINE__))
 #endif
-SQUIDCEXTERN void xassert(const char *, const char *, int);
+
+#ifdef __cplusplus
+extern "C" void
+#else
+extern void
+#endif
+xassert(const char *, const char *, int);
 
 #endif /* SQUID_ASSERT_H */

diff --git a/libsquid-compat/compat.h b/libsquid-compat/compat.h
index 980ef0759d3045a9de85556739f5a36bd57df1e5..260bd4dae886aaa3371ecaaff83827d75276e76c 100644 (file)
--- a/libsquid-compat/compat.h
+++ b/libsquid-compat/compat.h
@@ -24,14 +24,14 @@
 /* Define the _SQUID_TYPE_ based on a guess of the OS */
 /* NP: this MUST come first within compat.h           */
 /******************************************************/
-#include "osdetect.h"
+#include "libsquid-compat/osdetect.h"
 
 
 /*****************************************************/
 /* FDSETSIZE is messy and needs to be done before    */
 /* sys/types.h are defined.                          */
 /*****************************************************/
-#include "squid_fdsetsize.h"
+#include "libsquid-compat/fdsetsize.h"
 
 
 /*****************************************************/
@@ -49,20 +49,20 @@
 /* OS-macro wrapping should be done inside the OS .h */
 /*****************************************************/
 
-#include "os/squid_aix.h"
-#include "os/squid_dragonfly.h"
-#include "os/squid_freebsd.h"
-#include "os/squid_hpux.h"
-#include "os/squid_linux.h"
-#include "os/squid_mswin.h"
-#include "os/squid_next.h"
-#include "os/squid_openbsd.h"
-#include "os/squid_os2.h"
-#include "os/squid_qnx.h"
-#include "os/squid_sgi.h"
-#include "os/squid_solaris.h"
-#include "os/squid_sunos.h"
-#include "os/squid_windows.h"
+#include "libsquid-compat/os/aix.h"
+#include "libsquid-compat/os/dragonfly.h"
+#include "libsquid-compat/os/freebsd.h"
+#include "libsquid-compat/os/hpux.h"
+#include "libsquid-compat/os/linux.h"
+#include "libsquid-compat/os/mswin.h"
+#include "libsquid-compat/os/next.h"
+#include "libsquid-compat/os/openbsd.h"
+#include "libsquid-compat/os/os2.h"
+#include "libsquid-compat/os/qnx.h"
+#include "libsquid-compat/os/sgi.h"
+#include "libsquid-compat/os/solaris.h"
+#include "libsquid-compat/os/sunos.h"
+#include "libsquid-compat/os/windows.h"
 
 
 /*****************************************************/
@@ -70,16 +70,16 @@
 /* components as found to be needed                  */
 /*****************************************************/
 
-#include "compat_shared.h"
-#include "squid_stdvarargs.h"
-#include "assert.h"
+#include "libsquid-compat/compat_shared.h"
+#include "libsquid-compat/stdvarargs.h"
+#include "libsquid-compat/assert.h"
 
 /*****************************************************/
 /* component-specific portabilities                  */
 /*****************************************************/
 
 /* Valgrind API macros changed between two versions squid supports */
-#include "squid_valgrind.h"
+#include "libsquid-compat/valgrind.h"
 
 /* Endian functions are usualy handled by the OS but not always. */
 #include "squid_endian.h"
@@ -89,7 +89,7 @@
  * Default is to use a system provided one, but the bundle
  * may be used instead with explicit configuration.
  */
-#include "GnuRegex.h"
+#include "libsquid-compat/GnuRegex.h"
 
 
 #endif /* _SQUID_COMPAT_H */

diff --git a/libsquid-compat/squid_fdsetsize.h b/libsquid-compat/fdsetsize.h
similarity index 100%
rename from libsquid-compat/squid_fdsetsize.h
rename to libsquid-compat/fdsetsize.h

diff --git a/libsquid-compat/os/squid_aix.h b/libsquid-compat/os/aix.h
similarity index 100%
rename from libsquid-compat/os/squid_aix.h
rename to libsquid-compat/os/aix.h

diff --git a/libsquid-compat/os/squid_dragonfly.h b/libsquid-compat/os/dragonfly.h
similarity index 100%
rename from libsquid-compat/os/squid_dragonfly.h
rename to libsquid-compat/os/dragonfly.h

diff --git a/libsquid-compat/os/squid_freebsd.h b/libsquid-compat/os/freebsd.h
similarity index 100%
rename from libsquid-compat/os/squid_freebsd.h
rename to libsquid-compat/os/freebsd.h

diff --git a/libsquid-compat/os/squid_hpux.h b/libsquid-compat/os/hpux.h
similarity index 100%
rename from libsquid-compat/os/squid_hpux.h
rename to libsquid-compat/os/hpux.h

diff --git a/libsquid-compat/os/squid_linux.h b/libsquid-compat/os/linux.h
similarity index 100%
rename from libsquid-compat/os/squid_linux.h
rename to libsquid-compat/os/linux.h

diff --git a/libsquid-compat/os/squid_mswin.h b/libsquid-compat/os/mswin.h
similarity index 100%
rename from libsquid-compat/os/squid_mswin.h
rename to libsquid-compat/os/mswin.h

diff --git a/libsquid-compat/os/squid_next.h b/libsquid-compat/os/next.h
similarity index 100%
rename from libsquid-compat/os/squid_next.h
rename to libsquid-compat/os/next.h

diff --git a/libsquid-compat/os/squid_openbsd.h b/libsquid-compat/os/openbsd.h
similarity index 100%
rename from libsquid-compat/os/squid_openbsd.h
rename to libsquid-compat/os/openbsd.h

diff --git a/libsquid-compat/os/squid_os2.h b/libsquid-compat/os/os2.h
similarity index 100%
rename from libsquid-compat/os/squid_os2.h
rename to libsquid-compat/os/os2.h

diff --git a/libsquid-compat/os/squid_qnx.h b/libsquid-compat/os/qnx.h
similarity index 100%
rename from libsquid-compat/os/squid_qnx.h
rename to libsquid-compat/os/qnx.h

diff --git a/libsquid-compat/os/squid_sgi.h b/libsquid-compat/os/sgi.h
similarity index 100%
rename from libsquid-compat/os/squid_sgi.h
rename to libsquid-compat/os/sgi.h

diff --git a/libsquid-compat/os/squid_solaris.h b/libsquid-compat/os/solaris.h
similarity index 100%
rename from libsquid-compat/os/squid_solaris.h
rename to libsquid-compat/os/solaris.h

diff --git a/libsquid-compat/os/squid_sunos.h b/libsquid-compat/os/sunos.h
similarity index 100%
rename from libsquid-compat/os/squid_sunos.h
rename to libsquid-compat/os/sunos.h

diff --git a/libsquid-compat/os/squid_windows.h b/libsquid-compat/os/windows.h
similarity index 100%
rename from libsquid-compat/os/squid_windows.h
rename to libsquid-compat/os/windows.h

diff --git a/libsquid-compat/squid_stdvarargs.h b/libsquid-compat/stdvarargs.h
similarity index 100%
rename from libsquid-compat/squid_stdvarargs.h
rename to libsquid-compat/stdvarargs.h

diff --git a/libsquid-compat/squid_valgrind.h b/libsquid-compat/valgrind.h
similarity index 100%
rename from libsquid-compat/squid_valgrind.h
rename to libsquid-compat/valgrind.h