summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure10
-rw-r--r--doc/html/qmake-manual-2.html2
-rw-r--r--doc/html/tqglobal-h.html23
-rw-r--r--mkspecs/reliant-cds-64/qmake.conf84
-rw-r--r--mkspecs/reliant-cds-64/qplatformdefs.h58
-rw-r--r--mkspecs/reliant-cds/qmake.conf84
-rw-r--r--mkspecs/reliant-cds/qplatformdefs.h62
-rw-r--r--qmake/book/qmake-install.leaf4
-rwxr-xr-xsrc/3rdparty/libmng/config.guess14
-rwxr-xr-xsrc/3rdparty/libmng/config.sub7
-rw-r--r--src/tools/tqglobal.h23
11 files changed, 3 insertions, 368 deletions
diff --git a/configure b/configure
index 92bdf2227..dbece6eb3 100755
--- a/configure
+++ b/configure
@@ -428,9 +428,6 @@ while [ "$#" -gt 0 ]; do
irix-cc-n64)
PLATFORM=irix-cc-64
;;
- reliant-64)
- PLATFORM=reliant-cds-64
- ;;
solaris-64)
PLATFORM=solaris-cc-64
;;
@@ -1189,13 +1186,6 @@ if [ -z "$PLATFORM" ]; then
- Also available for Solaris: solaris-g++ solaris-cc-64
"
;;
- ReliantUNIX-*:*|SINIX-*:*)
- PLATFORM=reliant-cds
- #PLATFORM=reliant-cds-64
- PLATFORM_NOTES="
- - Also available for Reliant UNIX: reliant-cds-64
- "
- ;;
CYGWIN*:*)
PLATFORM=cygwin-g++
;;
diff --git a/doc/html/qmake-manual-2.html b/doc/html/qmake-manual-2.html
index cb1126dba..f51ae67b8 100644
--- a/doc/html/qmake-manual-2.html
+++ b/doc/html/qmake-manual-2.html
@@ -37,7 +37,7 @@ body { background: #ffffff; color: black; }
<p>Before building TQt manually the following environment variables must be set:</p>
<ul><li><p>QMAKESPEC <br> This must be set to the platform and compiler combination that you are using on your system. <br> For example, if you are using Windows and Microsoft Visual Studio, you would set this environment variable to <em>win32-msvc</em>. If you are using Solaris and g++, you would set this environment variable to <em>solaris-g++</em>.</p>
<p>The following is a list of environment variables available to choose from when setting QMAKESPEC:</p>
-<p>aix-64 hpux-cc irix-032 netbsd-g++ solaris-cc unixware7-g++ aix-g++ hpux-g++ linux-cxx openbsd-g++ solaris-g++ aix-xlc hpux-n64 linux-g++ openunix-cc sunos-g++ win32-g++ bsdi-g++ hpux-o64 linux-icc qnx-g++ tru64-cxx win32-msvc dgux-g++ hurd-g++ linux-kcc reliant-64 tru64-g++ win32-watc freebsd-g++ irix-64 macx-pbuilder reliant-cds ultrix-g++ win32-visa hpux-acc irix-g++ macx-g++ sco-g++ unixware-g hpux-acc irix-n32 solaris-64 unixware7-cc</p>
+<p>aix-64 hpux-cc irix-032 netbsd-g++ solaris-cc unixware7-g++ aix-g++ hpux-g++ linux-cxx openbsd-g++ solaris-g++ aix-xlc hpux-n64 linux-g++ openunix-cc sunos-g++ win32-g++ bsdi-g++ hpux-o64 linux-icc qnx-g++ tru64-cxx win32-msvc dgux-g++ hurd-g++ linux-kcc tru64-g++ win32-watc freebsd-g++ irix-64 macx-pbuilder ultrix-g++ win32-visa hpux-acc irix-g++ macx-g++ sco-g++ unixware-g hpux-acc irix-n32 solaris-64 unixware7-cc</p>
<li><p>TQTDIR <br> This must be set to where TQt is (or will be) installed. For example, <em>c:\qt</em> and <em>\local\qt</em></p>
</ul><p>Once the environment variables are set go into the qmake directory, <em>$TQTDIR/qmake</em>, e.g. <em>C:\qt\qmake</em>. Now run <em>make</em> or <em>nmake</em> depending on your compiler.</p>
<p>When the make has completed, <em>qmake</em> is ready for use.</p>
diff --git a/doc/html/tqglobal-h.html b/doc/html/tqglobal-h.html
index 18cf07aa6..a6b79ed1e 100644
--- a/doc/html/tqglobal-h.html
+++ b/doc/html/tqglobal-h.html
@@ -108,7 +108,6 @@ body { background: #ffffff; color: black; }
AIX - AIX
HURD - GNU Hurd
DGUX - DG/UX
- RELIANT - Reliant UNIX
DYNIX - DYNIX/ptx
TQNX - TQNX
TQNX6 - TQNX RTP 6.1
@@ -148,8 +147,6 @@ body { background: #ffffff; color: black; }
# define Q_OS_HPUX
#elif defined(__ultrix) || defined(ultrix)
# define Q_OS_ULTRIX
-#elif defined(sinix)
-# define Q_OS_RELIANT
#elif defined(__linux__) || defined(__linux) || defined(__GNU__) || defined(__GLIBC__)
# define Q_OS_LINUX
#elif defined(__FreeBSD__) || defined(__DragonFly__)
@@ -243,7 +240,6 @@ body { background: #ffffff; color: black; }
HP - HPUX C++
HPACC - HPUX ANSI C++
USLC - SCO OUDK, UDK, and UnixWare 2.X C++
- CDS - Reliant C++
KAI - KAI C++
INTEL - Intel C++ for Linux, Intel C++ for Windows
HIGHC - MetaWare High C/C++
@@ -478,15 +474,6 @@ body { background: #ffffff; color: black; }
# define Q_CC_OC
# define Q_NO_USING_KEYWORD
-/* CDS++ defines __EDG__ although this is not documented in the Reliant
- documentation. It also follows conventions like _BOOL and this documented */
-# elif defined(sinix)
-# define Q_CC_CDS
-# define Q_NO_USING_KEYWORD
-# if defined(__cplusplus) &amp;&amp; (__cplusplus &lt; 2) /* Cfront C++ mode */
-# define Q_NO_EXCEPTIONS
-# endif
-
/* The MIPSpro compiler in o32 mode is based on EDG but disables features
such as template specialization nevertheless */
# elif defined(__sgi)
@@ -540,16 +527,6 @@ body { background: #ffffff; color: black; }
# define Q_NO_USING_KEYWORD
# endif
-/* CDS++ does not seem to define __EDG__ or __EDG according to Reliant
- documentation but nevertheless uses EDG conventions like _BOOL */
-#elif defined(sinix)
-# define Q_CC_EDG
-# define Q_CC_CDS
-# if !defined(_BOOL)
-# define Q_NO_BOOL_TYPE
-# endif
-# define Q_BROKEN_TEMPLATE_SPECIALIZATION
-
#elif defined(Q_OS_HPUX)
/* __HP_aCC was not defined in first aCC releases */
# if defined(__HP_aCC) || __cplusplus &gt;= 199707L
diff --git a/mkspecs/reliant-cds-64/qmake.conf b/mkspecs/reliant-cds-64/qmake.conf
deleted file mode 100644
index 00b9d870c..000000000
--- a/mkspecs/reliant-cds-64/qmake.conf
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-#
-# qmake configuration for reliant-cds-64
-#
-# Written for Reliant UNIX 5.45 using the CDS++ C/C++ compiler V2.0C.
-#
-
-MAKEFILE_GENERATOR = UNIX
-TEMPLATE = app
-CONFIG += qt warn_on release link_prl
-
-QMAKE_CC = cc
-QMAKE_LEX = flex
-QMAKE_LEXFLAGS =
-QMAKE_YACC = yacc
-QMAKE_YACCFLAGS = -d
-QMAKE_CFLAGS = -Klp64
-QMAKE_CFLAGS_DEPS = -M
-QMAKE_CFLAGS_WARN_ON = -v
-QMAKE_CFLAGS_WARN_OFF = -w
-QMAKE_CFLAGS_RELEASE = -O
-QMAKE_CFLAGS_DEBUG = -g
-QMAKE_CFLAGS_SHLIB = -KPIC
-QMAKE_CFLAGS_YACC =
-QMAKE_CFLAGS_THREAD = -K pthread
-
-QMAKE_CXX = CC
-QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
-
-QMAKE_INCDIR =
-QMAKE_LIBDIR =
-QMAKE_INCDIR_X11 = /opt/X/include/X11
-QMAKE_LIBDIR_X11 = /opt/X/lib
-QMAKE_INCDIR_TQT = $(TQTDIR)/include
-QMAKE_LIBDIR_TQT = $(TQTDIR)/lib
-QMAKE_INCDIR_OPENGL =
-QMAKE_LIBDIR_OPENGL =
-
-QMAKE_LINK = CC
-QMAKE_LINK_SHLIB = CC
-QMAKE_LFLAGS = -Klp64
-QMAKE_LFLAGS_RELEASE =
-QMAKE_LFLAGS_DEBUG =
-QMAKE_LFLAGS_SHLIB = -G
-QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME = -h$$LITERAL_WHITESPACE
-QMAKE_LFLAGS_THREAD = -K pthread
-QMAKE_RPATH = -Wl,-Brpath=
-
-QMAKE_LIBS =
-QMAKE_LIBS_DYNLOAD = -ldl
-QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm
-QMAKE_LIBS_X11SM = -lSM -lICE
-QMAKE_LIBS_QT = -lqt
-QMAKE_LIBS_QT_THREAD = -ltqt-mt
-QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu
-QMAKE_LIBS_OPENGL_QT = -lGL -lXmu
-QMAKE_LIBS_THREAD =
-
-QMAKE_MOC = $(TQTDIR)/bin/tqmoc
-QMAKE_UIC = $(TQTDIR)/bin/tquic
-
-QMAKE_AR = CC -xar -o
-QMAKE_RANLIB =
-
-QMAKE_CLEAN = -r $(OBJECTS_DIR)/Templates.DB
-
-QMAKE_TAR = tar -cf
-QMAKE_GZIP = gzip -9f
-
-QMAKE_COPY = cp -f
-QMAKE_MOVE = mv -f
-QMAKE_DEL_FILE = rm -f
-QMAKE_DEL_DIR = rmdir
-QMAKE_CHK_DIR_EXISTS = test -d
-QMAKE_MKDIR = mkdir -p
diff --git a/mkspecs/reliant-cds-64/qplatformdefs.h b/mkspecs/reliant-cds-64/qplatformdefs.h
deleted file mode 100644
index 99fca770b..000000000
--- a/mkspecs/reliant-cds-64/qplatformdefs.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef TQPLATFORMDEFS_H
-#define TQPLATFORMDEFS_H
-
-// Get TQt defines/settings
-
-#include "tqglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#ifdef TQT_THREAD_SUPPORT
-#include <pthread.h>
-#endif
-
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/filio.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-// DNS header files are not fully covered by X/Open specifications.
-// In particular nothing is said about res_* :/
-#include <resolv.h>
-
-
-#define QT_SIGNAL_RETTYPE void
-#define QT_SIGNAL_ARGS int
-#define QT_SIGNAL_IGNORE SIG_IGN
-
-// on Reliant 5.45 and if __LP64__ *is* defined:
-// - socket functions use 'int'
-// - if _SOCKLEN_T is defined 'socklen_t' is typedef'ed to 'unsigned int'
-// which seems to be wrong so let's always use 'int' instead!
-#define QT_SOCKLEN_T int
-
-#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE) || (_XOPEN_SOURCE-0 >= 500)
-#define QT_SNPRINTF ::snprintf
-#define QT_VSNPRINTF ::vsnprintf
-#endif
-
-
-#endif // TQPLATFORMDEFS_H
diff --git a/mkspecs/reliant-cds/qmake.conf b/mkspecs/reliant-cds/qmake.conf
deleted file mode 100644
index fd29194ea..000000000
--- a/mkspecs/reliant-cds/qmake.conf
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-#
-# qmake configuration for reliant-cds
-#
-# Written for Reliant UNIX 5.45 using the CDS++ C/C++ compiler V2.0C.
-#
-
-MAKEFILE_GENERATOR = UNIX
-TEMPLATE = app
-CONFIG += qt warn_on release link_prl
-
-QMAKE_CC = cc
-QMAKE_LEX = flex
-QMAKE_LEXFLAGS =
-QMAKE_YACC = yacc
-QMAKE_YACCFLAGS = -d
-QMAKE_CFLAGS =
-QMAKE_CFLAGS_DEPS = -M
-QMAKE_CFLAGS_WARN_ON = -v
-QMAKE_CFLAGS_WARN_OFF = -w
-QMAKE_CFLAGS_RELEASE = -O
-QMAKE_CFLAGS_DEBUG = -g
-QMAKE_CFLAGS_SHLIB = -KPIC
-QMAKE_CFLAGS_YACC =
-QMAKE_CFLAGS_THREAD = -K pthread
-
-QMAKE_CXX = CC
-QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
-
-QMAKE_INCDIR =
-QMAKE_LIBDIR =
-QMAKE_INCDIR_X11 = /opt/X/include/X11
-QMAKE_LIBDIR_X11 = /opt/X/lib
-QMAKE_INCDIR_TQT = $(TQTDIR)/include
-QMAKE_LIBDIR_TQT = $(TQTDIR)/lib
-QMAKE_INCDIR_OPENGL =
-QMAKE_LIBDIR_OPENGL =
-
-QMAKE_LINK = CC
-QMAKE_LINK_SHLIB = CC
-QMAKE_LFLAGS =
-QMAKE_LFLAGS_RELEASE =
-QMAKE_LFLAGS_DEBUG =
-QMAKE_LFLAGS_SHLIB = -G
-QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME = -h$$LITERAL_WHITESPACE
-QMAKE_LFLAGS_THREAD = -K pthread
-QMAKE_RPATH = -Wl,-Brpath=
-
-QMAKE_LIBS =
-QMAKE_LIBS_DYNLOAD = -ldl
-QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm
-QMAKE_LIBS_X11SM = -lSM -lICE
-QMAKE_LIBS_QT = -lqt
-QMAKE_LIBS_QT_THREAD = -ltqt-mt
-QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu
-QMAKE_LIBS_OPENGL_QT = -lGL -lXmu
-QMAKE_LIBS_THREAD =
-
-QMAKE_MOC = $(TQTDIR)/bin/tqmoc
-QMAKE_UIC = $(TQTDIR)/bin/tquic
-
-QMAKE_AR = CC -xar -o
-QMAKE_RANLIB =
-
-QMAKE_CLEAN = -r $(OBJECTS_DIR)/Templates.DB
-
-QMAKE_TAR = tar -cf
-QMAKE_GZIP = gzip -9f
-
-QMAKE_COPY = cp -f
-QMAKE_MOVE = mv -f
-QMAKE_DEL_FILE = rm -f
-QMAKE_DEL_DIR = rmdir
-QMAKE_CHK_DIR_EXISTS = test -d
-QMAKE_MKDIR = mkdir -p
diff --git a/mkspecs/reliant-cds/qplatformdefs.h b/mkspecs/reliant-cds/qplatformdefs.h
deleted file mode 100644
index 718c7f4b8..000000000
--- a/mkspecs/reliant-cds/qplatformdefs.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef TQPLATFORMDEFS_H
-#define TQPLATFORMDEFS_H
-
-// Get TQt defines/settings
-
-#include "tqglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#ifdef TQT_THREAD_SUPPORT
-#include <pthread.h>
-#endif
-
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/filio.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-// DNS header files are not fully covered by X/Open specifications.
-// In particular nothing is said about res_* :/
-#include <resolv.h>
-
-
-#define QT_SIGNAL_RETTYPE void
-#define QT_SIGNAL_ARGS int
-#define QT_SIGNAL_IGNORE SIG_IGN
-
-// on Reliant 5.45 and if __LP64__ is *not* defined:
-// - socket functions use 'size_t'
-// - if _SOCKLEN_T is defined 'socklen_t' is typedef'ed to 'size_t'
-// note that 'size_t' would always be a good choice in this context
-#if defined(_SOCKLEN_T)
-# define QT_SOCKLEN_T socklen_t
-#else
-# define QT_SOCKLEN_T size_t
-#endif
-
-#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE) || (_XOPEN_SOURCE-0 >= 500)
-#define QT_SNPRINTF ::snprintf
-#define QT_VSNPRINTF ::vsnprintf
-#endif
-
-
-#endif // TQPLATFORMDEFS_H
diff --git a/qmake/book/qmake-install.leaf b/qmake/book/qmake-install.leaf
index 5182be521..3899232e4 100644
--- a/qmake/book/qmake-install.leaf
+++ b/qmake/book/qmake-install.leaf
@@ -26,8 +26,8 @@ aix-64 hpux-cc irix-032 netbsd-g++ solaris-cc unixware7-g++
aix-g++ hpux-g++ linux-cxx openbsd-g++ solaris-g++
aix-xlc hpux-n64 linux-g++ openunix-cc sunos-g++ win32-g++
bsdi-g++ hpux-o64 linux-icc qnx-g++ tru64-cxx win32-msvc
-dgux-g++ hurd-g++ linux-kcc reliant-64 tru64-g++ win32-watc
-freebsd-g++ irix-64 macx-pbuilder reliant-cds ultrix-g++ win32-visa
+dgux-g++ hurd-g++ linux-kcc tru64-g++ win32-watc
+freebsd-g++ irix-64 macx-pbuilder ultrix-g++ win32-visa
hpux-acc irix-g++ macx-g++ sco-g++ unixware-g
hpux-acc irix-n32 solaris-64 unixware7-cc
diff --git a/src/3rdparty/libmng/config.guess b/src/3rdparty/libmng/config.guess
index 11d85db25..bbb3a8dde 100755
--- a/src/3rdparty/libmng/config.guess
+++ b/src/3rdparty/libmng/config.guess
@@ -980,20 +980,6 @@ EOF
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
exit 0 ;;
- RM*:ReliantUNIX-*:*:*)
- echo mips-sni-sysv4
- exit 0 ;;
- RM*:SINIX-*:*:*)
- echo mips-sni-sysv4
- exit 0 ;;
- *:SINIX-*:*:*)
- if uname -p 2>/dev/null >/dev/null ; then
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
- echo ${UNAME_MACHINE}-sni-sysv4
- else
- echo ns32k-sni-sysv
- fi
- exit 0 ;;
PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
# says <Richard.M.Bartel@ccMail.Census.GOV>
echo i586-unisys-sysv4
diff --git a/src/3rdparty/libmng/config.sub b/src/3rdparty/libmng/config.sub
index 34efd933f..07355291b 100755
--- a/src/3rdparty/libmng/config.sub
+++ b/src/3rdparty/libmng/config.sub
@@ -1132,13 +1132,6 @@ case $os in
-nsk*)
os=-nsk
;;
- # Preserve the version number of sinix5.
- -sinix5.*)
- os=`echo $os | sed -e 's|sinix|sysv|'`
- ;;
- -sinix*)
- os=-sysv4
- ;;
-triton*)
os=-sysv3
;;
diff --git a/src/tools/tqglobal.h b/src/tools/tqglobal.h
index 3de27202c..67422110e 100644
--- a/src/tools/tqglobal.h
+++ b/src/tools/tqglobal.h
@@ -73,7 +73,6 @@
AIX - AIX
HURD - GNU Hurd
DGUX - DG/UX
- RELIANT - Reliant UNIX
DYNIX - DYNIX/ptx
TQNX - TQNX
TQNX6 - TQNX RTP 6.1
@@ -113,8 +112,6 @@
# define Q_OS_HPUX
#elif defined(__ultrix) || defined(ultrix)
# define Q_OS_ULTRIX
-#elif defined(sinix)
-# define Q_OS_RELIANT
#elif defined(__GNU__)
# define Q_OS_HURD
#elif defined(__linux__) || defined(__linux) || defined(__GNU__) || defined(__GLIBC__)
@@ -210,7 +207,6 @@
HP - HPUX C++
HPACC - HPUX ANSI C++
USLC - SCO OUDK, UDK, and UnixWare 2.X C++
- CDS - Reliant C++
KAI - KAI C++
INTEL - Intel C++ for Linux, Intel C++ for Windows
HIGHC - MetaWare High C/C++
@@ -445,15 +441,6 @@
# define Q_CC_OC
# define Q_NO_USING_KEYWORD
-/* CDS++ defines __EDG__ although this is not documented in the Reliant
- documentation. It also follows conventions like _BOOL and this documented */
-# elif defined(sinix)
-# define Q_CC_CDS
-# define Q_NO_USING_KEYWORD
-# if defined(__cplusplus) && (__cplusplus < 2) /* Cfront C++ mode */
-# define Q_NO_EXCEPTIONS
-# endif
-
/* The MIPSpro compiler in o32 mode is based on EDG but disables features
such as template specialization nevertheless */
# elif defined(__sgi)
@@ -507,16 +494,6 @@
# define Q_NO_USING_KEYWORD
# endif
-/* CDS++ does not seem to define __EDG__ or __EDG according to Reliant
- documentation but nevertheless uses EDG conventions like _BOOL */
-#elif defined(sinix)
-# define Q_CC_EDG
-# define Q_CC_CDS
-# if !defined(_BOOL)
-# define Q_NO_BOOL_TYPE
-# endif
-# define Q_BROKEN_TEMPLATE_SPECIALIZATION
-
#elif defined(Q_OS_HPUX)
/* __HP_aCC was not defined in first aCC releases */
# if defined(__HP_aCC) || __cplusplus >= 199707L