Support for new Solaris/OpenIndiana versions

2015-05-09 00:14:52 +02:00
parent 0306c7c6f2
commit 2b8b5f25b5
14 changed files with 21 additions and 616 deletions
--- a/cde/programs/nsgmls/Imakefile
+++ b/cde/programs/nsgmls/Imakefile
@@ -122,7 +122,6 @@ M4 = /bin/m4
 CXXOPTIONS = \
  -DSP_VOLATILE= -DSP_CONST= \
  -DSP_HAVE_LOCALE -DSP_MULTI_BYTE -DSP_ANSI_CLASS_INST
-EXTRA_INCLUDES = -I/opt/SUNWspro/SC2.0.1/include/CC

 /*
 * Flags passed into compile step when doing manual template instantiation.
--- a/cde/programs/nsgmls/assert.C
+++ b/cde/programs/nsgmls/assert.C
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include "macros.h"

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(sun)
 void exit(int) __attribute__((noreturn));
 #endif