OpenIndiana and Solaris port
This commit is contained in:
committed by
Jon Trulson
parent
42e891d9e7
commit
01d6c363fa
@@ -23,11 +23,11 @@ XCOMM .../programs/dtinfo/mmdb/<subdir>/Imakefile
|
||||
#define LargePICTable YES
|
||||
|
||||
#define CplusplusSource YES
|
||||
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
|
||||
DEPEND_DEFINES = $(DEPENDDEFINES)
|
||||
|
||||
XCOMM In DtMmdb we compile as C_API sources.
|
||||
DEFINES = -DC_API -DPORTABLE_DB
|
||||
INCLUDES = -I.. $(EXCEPTIONS_INCLUDES) -I../misc
|
||||
INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES) -I../misc
|
||||
|
||||
BASE_SRCS = \
|
||||
funcs.C ostring.C pm_random.C atoi_pearson.C \
|
||||
|
||||
@@ -26,7 +26,8 @@
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#if !defined(hpux) && !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
|
||||
#if !defined(hpux) && !defined(__osf__) && !defined(USL) && \
|
||||
!defined(linux) && !defined(CSRG_BASED) && !defined(sun)
|
||||
#include <sysent.h>
|
||||
#endif
|
||||
|
||||
|
||||
@@ -53,11 +53,11 @@
|
||||
#define _funcs_h 1
|
||||
|
||||
#if !defined(USL) && !defined(__osf__) && !defined(linux) && \
|
||||
!defined(CSRG_BASED)
|
||||
!defined(CSRG_BASED) && !defined(sun)
|
||||
#include <libc.h>
|
||||
#endif
|
||||
#if defined(hpux) || defined(sgi) || defined(USL) ||defined(__osf__) || \
|
||||
defined(linux) || defined(CSRG_BASED)
|
||||
defined(linux) || defined(CSRG_BASED) || defined(sun)
|
||||
#include <unistd.h>
|
||||
#else
|
||||
#include <sysent.h>
|
||||
|
||||
@@ -72,7 +72,7 @@ extern int errno;
|
||||
class mmdbException : public Exception
|
||||
{
|
||||
public:
|
||||
DECLARE_EXCEPTION(mmdbException, Exception);
|
||||
DECLARE_EXCEPTION(mmdbException, Exception)
|
||||
|
||||
virtual ~mmdbException() {};
|
||||
|
||||
@@ -90,7 +90,7 @@ protected:
|
||||
char* msg;
|
||||
|
||||
public:
|
||||
DECLARE_EXCEPTION(stringException, mmdbException);
|
||||
DECLARE_EXCEPTION(stringException, mmdbException)
|
||||
|
||||
stringException(char const* m) : msg((char*)m) {};
|
||||
~stringException() {};
|
||||
@@ -104,7 +104,7 @@ class formatException : public stringException
|
||||
protected:
|
||||
|
||||
public:
|
||||
DECLARE_EXCEPTION(formatException, stringException);
|
||||
DECLARE_EXCEPTION(formatException, stringException)
|
||||
|
||||
formatException(char const* m) : stringException(m) {};
|
||||
~formatException() {};
|
||||
@@ -118,7 +118,7 @@ protected:
|
||||
int v_code;
|
||||
|
||||
public:
|
||||
DECLARE_EXCEPTION(intException, mmdbException);
|
||||
DECLARE_EXCEPTION(intException, mmdbException)
|
||||
|
||||
intException(int c) : v_code(c) {};
|
||||
~intException() {};
|
||||
@@ -133,7 +133,7 @@ class systemException : public intException
|
||||
{
|
||||
|
||||
public:
|
||||
DECLARE_EXCEPTION(systemException, intException);
|
||||
DECLARE_EXCEPTION(systemException, intException)
|
||||
|
||||
systemException(int c) : intException(c) {};
|
||||
~systemException() {};
|
||||
@@ -145,7 +145,7 @@ class streamException : public intException
|
||||
protected:
|
||||
|
||||
public:
|
||||
DECLARE_EXCEPTION(streamException, intException);
|
||||
DECLARE_EXCEPTION(streamException, intException)
|
||||
|
||||
streamException(int c) : intException(c) {};
|
||||
~streamException() {};
|
||||
@@ -160,7 +160,7 @@ protected:
|
||||
long mindex;
|
||||
|
||||
public:
|
||||
DECLARE_EXCEPTION(boundaryException, mmdbException);
|
||||
DECLARE_EXCEPTION(boundaryException, mmdbException)
|
||||
|
||||
boundaryException(long l, long h, long i) :
|
||||
low(l), high(h), mindex(i) {};
|
||||
@@ -173,7 +173,7 @@ public:
|
||||
class beginTransException: public mmdbException
|
||||
{
|
||||
public:
|
||||
DECLARE_EXCEPTION(beginTransException, mmdbException);
|
||||
DECLARE_EXCEPTION(beginTransException, mmdbException)
|
||||
beginTransException() {};
|
||||
~beginTransException() {};
|
||||
};
|
||||
@@ -181,7 +181,7 @@ public:
|
||||
class commitTransException: public mmdbException
|
||||
{
|
||||
public:
|
||||
DECLARE_EXCEPTION(commitTransException, mmdbException);
|
||||
DECLARE_EXCEPTION(commitTransException, mmdbException)
|
||||
commitTransException() {};
|
||||
~commitTransException() {};
|
||||
};
|
||||
@@ -189,7 +189,7 @@ public:
|
||||
class rollbackTransException: public mmdbException
|
||||
{
|
||||
public:
|
||||
DECLARE_EXCEPTION(rollbackTransException, mmdbException);
|
||||
DECLARE_EXCEPTION(rollbackTransException, mmdbException)
|
||||
rollbackTransException() {};
|
||||
~rollbackTransException() {};
|
||||
};
|
||||
@@ -202,7 +202,7 @@ protected:
|
||||
const char* f_name;
|
||||
|
||||
public:
|
||||
DECLARE_EXCEPTION(demoException, mmdbException);
|
||||
DECLARE_EXCEPTION(demoException, mmdbException)
|
||||
|
||||
demoException(const char* p, const char* n) : f_path(p), f_name(n) {};
|
||||
virtual ~demoException() {};
|
||||
|
||||
@@ -23,7 +23,8 @@
|
||||
/* $XConsortium: streambuf.C /main/8 1996/08/21 15:55:14 drk $ */
|
||||
#include "utility/c_streambuf.h"
|
||||
|
||||
#if defined(USL) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
|
||||
#if defined(USL) || defined(__osf__) || defined(linux) || \
|
||||
defined(CSRG_BASED) || defined(sun)
|
||||
#include <stdlib.h>
|
||||
#else
|
||||
#include <libc.h>
|
||||
|
||||
Reference in New Issue
Block a user