OpenIndiana and Solaris port
This commit is contained in:
committed by
Jon Trulson
parent
42e891d9e7
commit
01d6c363fa
@@ -54,7 +54,8 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#if !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
|
||||
#if !defined(__osf__) && !defined(USL) && !defined(linux) && \
|
||||
!defined(CSRG_BASED) && !defined(sun)
|
||||
#include <osfcn.h>
|
||||
#endif
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@ public:
|
||||
const char *msg(void) const { return f_msg; };
|
||||
int error_no(void) const { return f_errno; };
|
||||
|
||||
DECLARE_EXCEPTION(PosixError, Exception);
|
||||
DECLARE_EXCEPTION(PosixError, Exception)
|
||||
|
||||
private:
|
||||
char f_msg[MAXMSG+1];
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
XCOMM $TOG: Imakefile /main/27 1997/09/05 11:29:30 samborn $
|
||||
|
||||
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
|
||||
DEPEND_DEFINES = $(DEPENDDEFINES)
|
||||
CXXEXTRA_INCLUDES = -DEXPAND_TEMPLATES
|
||||
|
||||
NormalCplusplusObjectRule()
|
||||
@@ -22,7 +22,7 @@ INCLUDES=-I/VOB/olias/control/rogue
|
||||
ROGUE_LIBS=$(RW_LIBDIR) $(RW_LIB)
|
||||
#endif
|
||||
|
||||
INCLUDES=$(MMDB_INCLUDES) $(EXCEPTIONS_INCLUDES) \
|
||||
INCLUDES=$(CXXDEPENDINCLUDES) $(MMDB_INCLUDES) $(EXCEPTIONS_INCLUDES) \
|
||||
$(MISC_INCLUDES) $(GLOBAL_INCLUDES) $(DBUG_INCLUDES) \
|
||||
$(COMMON_CLASS_INCLUDES) $(LIC_INCLUDES)
|
||||
|
||||
@@ -158,7 +158,7 @@ DTI_CC_OBJS = \
|
||||
$(MMDB_DIR)/dti_cc/CC_String.o $(MMDB_DIR)/dti_cc/CC_Tokenizer.o \
|
||||
$(MMDB_DIR)/dti_cc/CC_Stack.o $(MMDB_DIR)/dti_cc/CC_Slist.o
|
||||
|
||||
#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
|
||||
#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion < 4)
|
||||
EXTRA_HARDCOPY_OBJS = $(MMDB_DIR)/HardCopy/TemplatesAutoNumber.o
|
||||
#endif
|
||||
|
||||
@@ -167,7 +167,7 @@ HARDCOPY_OBJS = \
|
||||
$(MMDB_DIR)/HardCopy/autoNumber.o $(MMDB_DIR)/HardCopy/autoNumberFP.o \
|
||||
$(EXTRA_HARDCOPY_OBJS)
|
||||
|
||||
#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
|
||||
#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion < 4)
|
||||
EXTRA_STYLESHEET_OBJS = $(MMDB_DIR)/StyleSheet/SSTemplates.o
|
||||
#endif
|
||||
|
||||
@@ -283,14 +283,15 @@ CMD_OBJS = $(CMD_SRCS:.C=.o)
|
||||
XCOMM #######################################
|
||||
XCOMM Template handling
|
||||
XCOMM #######################################
|
||||
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
|
||||
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
|
||||
all::$(CMD_OBJS)
|
||||
SimpleLibraryT(OLAFParse,$(OBJS),$(LIBDIR))
|
||||
SimpleCPlusPlusProgram(NodeParser, NodeParser.o libOLAFParse.a libOLAFParseT.a,$(Libs))
|
||||
SimpleCPlusPlusProgram(NCFGen, NCFGen.o libOLAFParse.a libOLAFParseT.a,$(Libs) $(DTSVCLIB) $(TTLIB))
|
||||
SimpleCPlusPlusProgram(MixedGen, MixedGen.o RemoteId.o libOLAFParse.a libOLAFParseT.a,$(Libs) $(DTSVCLIB) $(TTLIB))
|
||||
SimpleCPlusPlusProgram(StyleUpdate, StyleUpdate.o libOLAFParse.a libOLAFParseT.a,$(Libs) $(DTSVCLIB) $(TTLIB))
|
||||
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
|
||||
#elif defined(LinuxArchitecture) || defined(BSDArchitecture) || \
|
||||
defined(SunArchitecture)
|
||||
TEMPLATE_OBJS = TKTemplate.o
|
||||
RealLibrary(OLAFParse,$(OBJS),$(LIBDIR))
|
||||
SimpleCPlusPlusProgram(NodeParser, NodeParser.o $(TEMPLATE_OBJS) libOLAFParse.a,$(Libs))
|
||||
|
||||
@@ -53,7 +53,8 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#if !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
|
||||
#if !defined(__osf__) && !defined(USL) && !defined(linux) && \
|
||||
!defined(CSRG_BASED) && !defined(sun)
|
||||
# include <osfcn.h>
|
||||
#endif
|
||||
|
||||
|
||||
@@ -43,7 +43,8 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#if !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
|
||||
#if !defined(__osf__) && !defined(USL) && !defined(linux) && \
|
||||
!defined(CSRG_BASED) && !defined(sun)
|
||||
#include <osfcn.h>
|
||||
#endif
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ public:
|
||||
|
||||
const char *msg(void) { return msg_; };
|
||||
|
||||
DECLARE_EXCEPTION(Unexpected, Exception);
|
||||
DECLARE_EXCEPTION(Unexpected, Exception)
|
||||
|
||||
private:
|
||||
const char *msg_;
|
||||
|
||||
@@ -144,7 +144,7 @@ public:
|
||||
int f_source;
|
||||
int f_severity;
|
||||
|
||||
DECLARE_EXCEPTION(ErrorReported, Exception);
|
||||
DECLARE_EXCEPTION(ErrorReported, Exception)
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -42,6 +42,9 @@
|
||||
#endif
|
||||
#include <ctype.h>
|
||||
#include <signal.h>
|
||||
#if !defined(CSRG_BASED)
|
||||
#include <sys/sysmacros.h>
|
||||
#endif
|
||||
#include <sys/param.h>
|
||||
#include <sys/stat.h>
|
||||
#include <X11/Intrinsic.h>
|
||||
|
||||
@@ -54,7 +54,8 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#if !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
|
||||
#if !defined(__osf__) && !defined(USL) && !defined(linux) && \
|
||||
!defined(CSRG_BASED) && !defined(sun)
|
||||
# include <osfcn.h>
|
||||
#else
|
||||
# include <unistd.h>
|
||||
|
||||
@@ -42,7 +42,8 @@
|
||||
#ifdef __cplusplus
|
||||
|
||||
#include <stdlib.h>
|
||||
#if !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
|
||||
#if !defined(__osf__) && !defined(USL) && !defined(linux) && \
|
||||
!defined(CSRG_BASED) && !defined(sun)
|
||||
#include <osfcn.h>
|
||||
#endif
|
||||
|
||||
@@ -190,7 +191,8 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
|
||||
#define YY_CHAR unsigned char
|
||||
#define INITIAL 0
|
||||
|
||||
#if !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
|
||||
#if !defined(__osf__) && !defined(USL) && !defined(linux) && \
|
||||
!defined(CSRG_BASED) && !defined(sun)
|
||||
#include <osfcn.h>
|
||||
#else
|
||||
#include <unistd.h>
|
||||
|
||||
Reference in New Issue
Block a user