projects
/
oweals
/
cde.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dsdm: Change to ANSI function definitions
[oweals/cde.git]
/
cde
/
programs
/
nsgmls
/
CodingSystem.C
diff --git
a/cde/programs/nsgmls/CodingSystem.C
b/cde/programs/nsgmls/CodingSystem.C
index 6f9e520740d539afe9d9729431b2f4c17f6cec91..b299164398454b60b7540c28ac341b91ad727b6a 100644
(file)
--- a/
cde/programs/nsgmls/CodingSystem.C
+++ b/
cde/programs/nsgmls/CodingSystem.C
@@
-16,7
+16,7
@@
* details.
*
* You should have received a copy of the GNU Lesser General Public
* details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with these librar
ar
ies and programs; if not, write
+ * License along with these libraries and programs; if not, write
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
@@
-33,7
+33,7
@@
#ifdef SP_SHORT_HEADERS
#include <strstrea.h>
#else
#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>
#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();
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());
String<char> result(s, stream.pcount());
#else
String<char> result(s, stream.out_waiting());