external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Make nsgmls compile on OpenBSD.

Browse source 
As far as I can tell, the duplicate instantiations from entmgr_inst.m4 are
unnecessary and only cause compile failures without -fpermissive.
This commit is contained in:
Pascal Stumpf 2012-08-11 14:09:40 +02:00 • committed by Jon Trulson
parent e3ad7e24e3
commit 205e26b3ef
10 changed files with 15 additions and 21 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" #include "ConsoleOutput.h"
#if defined(linux) #if defined(linux) || defined(CSRG_BASED)
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
using namespace std; using namespace std;
@ -292,7 +292,7 @@ Boolean CmdLineApp::openFilebufWrite(filebuf &file,
return 0; return 0;
return file.attach(fd) != 0; return file.attach(fd) != 0;
#else #else
#if defined(linux) #if defined(linux) || defined(CSRG_BASED)
return file.open(filename, ios::out|ios::trunc) != 0; return file.open(filename, ios::out|ios::trunc) != 0;
#else #else
return file.open(filename, ios::out|ios::trunc|IOS_BINARY) != 0; 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> #include <stddef.h>
#endif #endif
#if defined(linux) #if defined(linux) || defined(CSRG_BASED)
#include <fstream> #include <fstream>
using namespace std; using namespace std;
#else #else

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

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

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

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

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

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

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

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

2
cde/programs/nsgmls/config.h
View file

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

6
cde/programs/nsgmls/entmgr_inst.m4
View file

@ -61,7 +61,6 @@ __instantiate(`RangeMapIter<WideChar,UnivChar>')
__instantiate(`RangeMap<WideChar,UnivChar>') __instantiate(`RangeMap<WideChar,UnivChar>')
__instantiate(Vector<InputSourceOriginNamedCharRef>) __instantiate(Vector<InputSourceOriginNamedCharRef>)
__instantiate(Vector<StringC>) __instantiate(Vector<StringC>)
__instantiate(Vector<String<EquivCode> >)
__instantiate(Owner<ExternalInfo>) __instantiate(Owner<ExternalInfo>)
__instantiate(ISet<Char>) __instantiate(ISet<Char>)
__instantiate(Vector<ISetRange<Char> >) __instantiate(Vector<ISetRange<Char> >)
@ -71,16 +70,11 @@ __instantiate(ISetIter<WideChar>)
__instantiate(Vector<ISetRange<WideChar> >) __instantiate(Vector<ISetRange<WideChar> >)
__instantiate(SubstTable<Char>) __instantiate(SubstTable<Char>)
__instantiate(SharedXcharMap<PackedBoolean>) __instantiate(SharedXcharMap<PackedBoolean>)
__instantiate(SharedXcharMap<unsigned char>)
__instantiate(SharedXcharMap<EquivCode>) __instantiate(SharedXcharMap<EquivCode>)
__instantiate(String<EquivCode>)
__instantiate(String<SyntaxChar>) __instantiate(String<SyntaxChar>)
__instantiate(XcharMap<PackedBoolean>) __instantiate(XcharMap<PackedBoolean>)
__instantiate(XcharMap<unsigned char>)
__instantiate(XcharMap<EquivCode>) __instantiate(XcharMap<EquivCode>)
__instantiate(Vector<char>) __instantiate(Vector<char>)
__instantiate(Vector<PackedBoolean>)
__instantiate(SubstTable<Char>)
#ifdef SP_NAMESPACE #ifdef SP_NAMESPACE
} }

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

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