Ported to Solaris

3 files changed, 15 insertions, 5 deletions

diff --git a/comm/OLD/dgram.cc b/comm/OLD/dgram.cc
index 712c1be..d0cc6bb 100644
--- a/comm/OLD/dgram.cc
+++ b/comm/OLD/dgram.cc
@@ -33,6 +33,10 @@ extern "C" {
 }
 #endif
 
+#if defined(sun) && defined(__svr4__)
+#include <sys/filio.h>
+#endif
+
 /*?class UchDGRAM
 The class \typ{UchDGRAM} is derived from \typ{UchDatagram}.
 It adds to a datagram a simple protocol to ensure that all messages sent are received.
diff --git a/utils/RegExp.h b/utils/RegExp.h
index c46431c..85c9853 100644
--- a/utils/RegExp.h
+++ b/utils/RegExp.h
@@ -3,7 +3,7 @@
  *
  *	by Stephane Chatty
  *
- *	Copyright 1991, 1992
+ *	Copyright 1991 - 1994
  *	Laboratoire de Recherche en Informatique (LRI)
  *	Centre d'Etudes de la Navigation Aerienne (CENA)
  *
@@ -16,14 +16,20 @@
 #ifndef RegExp_H_
 #define RegExp_H_
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "cplus_bugs.h"
 #include "bool.h"
 
-#ifdef __hpux
+#ifdef __hpux /* POSIX */
 #define REGCOMP
 #else
+#if !defined(sun) || !defined(__svr4__)
 #define RE_COMP
 #endif
+#endif
 
 #ifdef REGCOMP
 
@@ -78,4 +84,3 @@ inline	const char*	GetExpr ()	{ return String; }
 #endif	/* !REGCOMP && !RE_COMP */
 
 #endif	/* RegExp_H_ */
-
diff --git a/utils/Signal.cc b/utils/Signal.cc
index 507a6ac..45563f1 100644
--- a/utils/Signal.cc
+++ b/utils/Signal.cc
@@ -14,7 +14,7 @@
 
 #include "Signal.h"
 #include "List.h"
-#ifdef sun
+#if defined(sun) && !defined (__svr4__)
 /* This should come from <signal.h>, but no available C++ headers on Suns know about POSIX */
 extern "C" {
 	typedef int sigset_t;
@@ -124,8 +124,9 @@ const int SigCont = SIGCONT;
 const int SigTtin = SIGTTIN;
 const int SigTtou = SIGTTOU;
 const int SigUrg = SIGURG;
+#if !defined(sun) || !defined(__svr4__)
 const int SigLost = SIGLOST;
-
+#endif
 
 CcuList* CcuBaseSignalHandler::HandlerStacks = 0;