Bug 4610 pt2: compile errors on Solaris 11.3 with Oracle Studio 12.5

diff --git a/compat/compat.h b/compat/compat.h
index 00714ed4fdb57f5c6e709dbde08f74627fd526c3..32aee5884b566c30bdd45da96d81ce2e789d7f8d 100644 (file)
--- a/compat/compat.h
+++ b/compat/compat.h
@@ -29,19 +29,6 @@
 /******************************************************/
 #include "compat/osdetect.h"
 
-/* ugly hack. But we need to set this REALLY soon in the header */
-#if _SQUID_SOLARIS_ && !defined(__GNUC__) && !defined(__GNUG__)
-#ifndef __EXTENSIONS__
-#define __EXTENSIONS__ 1
-#endif
-#ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE 1
-#endif
-#ifndef _XOPEN_SOURCE_EXTENDED
-#define _XOPEN_SOURCE_EXTENDED 1
-#endif
-#endif
-
 /* Solaris 10 has a broken definition for minor_t in IPFilter compat.
  * We must pre-define before doing anything with OS headers so the OS
  * do not. Then un-define it before using the IPFilter *_compat.h headers.

diff --git a/compat/os/solaris.h b/compat/os/solaris.h
index 7e8ad463cf54636805169d5fa3eea729562995dc..de946e8127554bd842f51c70a28cff20dd5f0138 100644 (file)
--- a/compat/os/solaris.h
+++ b/compat/os/solaris.h
@@ -48,6 +48,11 @@ typedef union {
 #include <sys/resource.h>
 SQUIDCEXTERN int getrusage(int, struct rusage *);
 
+// Solaris 11 needs this before <sys/socket.h> to get the definition for msg_control
+// and possibly other type definitions we dont know about specifically
+#define _XPG4_2 1
+#include <sys/socket.h>
+
 /**
  * prototypes for system function missing from system includes
  * on some Solaris systems.