debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OpenIndiana and Solaris port

Browse Source
This commit is contained in:
Ulrich Wilkens
2014-10-28 19:46:43 +01:00
committed by Jon Trulson
parent 42e891d9e7
commit 01d6c363fa
296 changed files with 1049 additions and 1091 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cde/programs/nsgmls/CmdLineApp.C
View File

@@ -58,7 +58,7 @@
#include "ConsoleOutput.h"
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <iostream>
#include <fstream>
using namespace std;
@@ -292,7 +292,7 @@ Boolean CmdLineApp::openFilebufWrite(filebuf &file,
return 0;
return file.attach(fd) != 0;
#else
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
return file.open(filename, ios::out|ios::trunc) != 0;
#else
return file.open(filename, ios::out|ios::trunc|IOS_BINARY) != 0;

2
cde/programs/nsgmls/CmdLineApp.h
View File

@@ -43,7 +43,7 @@
#include <stddef.h>
#endif
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <fstream>
using namespace std;
#else

4
cde/programs/nsgmls/CodingSystem.C
View File

@@ -33,7 +33,7 @@
#ifdef SP_SHORT_HEADERS
#include <strstrea.h>
#else
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <strstream>
#else
#include <strstream.h>
@@ -82,7 +82,7 @@ String<char> OutputCodingSystem::convertOut(const StringC &str) const
encoder->output(copy.data(), copy.size(), &stream);
delete encoder;
char *s = stream.str();
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
String<char> result(s, stream.pcount());
#else
String<char> result(s, stream.out_waiting());

2
cde/programs/nsgmls/CodingSystem.h
View File

@@ -41,7 +41,7 @@
#include <stddef.h>
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <streambuf>
using namespace std;
#else

2
cde/programs/nsgmls/EUCJPCodingSystem.C
View File

@@ -29,7 +29,7 @@
#ifdef SP_MULTI_BYTE
#include "EUCJPCodingSystem.h"
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <iostream>
#else
#include <iostream.h>

2
cde/programs/nsgmls/Fixed2CodingSystem.C
View File

@@ -34,7 +34,7 @@
#include "Fixed2CodingSystem.h"
#include "macros.h"
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <iostream>
#else
#include <iostream.h>

2
cde/programs/nsgmls/IdentityCodingSystem.C
View File

@@ -26,7 +26,7 @@
#include "splib.h"
#include "IdentityCodingSystem.h"
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <iostream>
#else
#include <iostream.h>

2
cde/programs/nsgmls/Imakefile
View File

@@ -1,6 +1,6 @@
XCOMM $TOG: Imakefile /main/13 1998/04/06 13:38:18 mgreess $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
#include <Library.tmpl>

4
cde/programs/nsgmls/OutputCharStream.C
View File

@@ -28,7 +28,7 @@
#include "OutputCharStream.h"
#include "CodingSystem.h"
#include "macros.h"
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <iostream>
#else
#include <iostream.h>
@@ -148,7 +148,7 @@ void IosOutputCharStream::flush()
encoder_->output(buf_, ptr_ - buf_, byteStream_);
ptr_ = buf_;
}
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
byteStream_->pubsync();
#else
byteStream_->sync();

2
cde/programs/nsgmls/OutputCharStream.h
View File

@@ -33,7 +33,7 @@
#include "Owner.h"
#include "CodingSystem.h"
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <streambuf>
using namespace std;
#else

2
cde/programs/nsgmls/SJISCodingSystem.C
View File

@@ -30,7 +30,7 @@
#include "SJISCodingSystem.h"
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <iostream>
#else
#include <iostream.h>

2
cde/programs/nsgmls/UTF8CodingSystem.C
View File

@@ -30,7 +30,7 @@
#include "UTF8CodingSystem.h"
#include "constant.h"
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <iostream>
#else
#include <iostream.h>

2
cde/programs/nsgmls/UnicodeCodingSystem.C
View File

@@ -39,7 +39,7 @@ extern "C" {
void *memmove(void *, const void *, size_t);
}
#endif
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <iostream>
#else
#include <iostream.h>

4
cde/programs/nsgmls/config.h
View File

@@ -30,9 +30,9 @@
#define SP_INCLUDE_UNISTD_H
#define SP_POSIX_FILENAMES
#ifdef __GNUG__
#if defined(__GNUG__) || defined(__SunOS)
// It's not missing, but it pulls in libg++
#if !defined(linux) && !defined(CSRG_BASED)
#if !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
#define SP_NEW_H_MISSING
// set_new_handler() has to be declared extern "C"
#define SP_SET_NEW_HANDLER_EXTERN_C

8
cde/programs/nsgmls/nsgmls.C
View File

@@ -38,7 +38,7 @@
#include "sptchar.h"
#include "macros.h"
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <iostream>
#include <fstream>
#else
@@ -84,7 +84,7 @@ public:
const AppChar *filename,
const StringC &filenameStr,
const OutputCodingSystem *,
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
::Messenger *messenger);
#else
Messenger *messenger);
@@ -94,7 +94,7 @@ public:
void truncateOutput();
void allLinkTypesActivated();
private:
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
::Messenger *messenger_;
#else
Messenger *messenger_;
@@ -248,7 +248,7 @@ XRastEventHandler::XRastEventHandler(SgmlParser *parser,
const AppChar *filename,
const StringC &filenameStr,
const OutputCodingSystem *codingSystem,
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
::Messenger *messenger)
#else
::Messenger *messenger)

2
cde/programs/nsgmls/xnew.h
View File

@@ -39,7 +39,7 @@ void set_new_handler(VFP);
#else /* not SP_NEW_H_MISSING */
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <new>
#else
#include <new.h>