Cleanup: shuffle new() hack for SGI into compat.

diff --git a/compat/os/sgi.h b/compat/os/sgi.h
index 5fc9e67ac39e850e9fa82205dd511fe9b4889d70..dc5bef703aff774ffe0b607b273473dccc44095a 100644 (file)
--- a/compat/os/sgi.h
+++ b/compat/os/sgi.h
@@ -21,6 +21,14 @@
 #define _ABI_SOURCE
 #endif /* USE_ASYNC_IO */
 
+#if defined(__cplusplus) && !defined(_SQUID_EXTERNNEW_) && !defined(_GNUC_)
+/*
+ * The gcc compiler treats extern inline functions as being extern,
+ * while the SGI MIPSpro compilers treat them as inline. To get equivalent
+ * behavior, remove the inline keyword.
+ */
+#define _SQUID_EXTERNNEW_ extern
+#endif
 
 #endif /* _SQUID_SGI_ */
 #endif /* SQUID_OS_SGI_H */

diff --git a/include/util.h b/include/util.h
index 093225d7837e276290d93ae26df755f3c85dc99c..28f56d29bfef02b19e074a3a837317a8cb953248 100644 (file)
--- a/include/util.h
+++ b/include/util.h
@@ -81,21 +81,12 @@ SQUIDCEXTERN void xxfree(const void *);
  * for the extern version in squid
  */
 #ifndef _SQUID_EXTERNNEW_
-#if defined(_SQUID_SGI_) && !defined(_GNUC_)
-/*
- * The gcc compiler treats extern inline functions as being extern,
- * while the SGI MIPSpro compilers treat them as inline. To get equivalent
- * behavior, remove the inline keyword.
- */
-#define _SQUID_EXTERNNEW_ extern
-#else
 #ifdef __GNUC_STDC_INLINE__
 #define _SQUID_EXTERNNEW_ extern inline __attribute__((gnu_inline))
 #else
 #define _SQUID_EXTERNNEW_ extern inline
 #endif
 #endif
-#endif
 #include "SquidNew.h"
 #endif