projects
/
oweals
/
cde.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nsgml: Resolve symbol collision when building with SunStudio 12.1
[oweals/cde.git]
/
cde
/
programs
/
nsgmls
/
OutputCharStream.h
diff --git
a/cde/programs/nsgmls/OutputCharStream.h
b/cde/programs/nsgmls/OutputCharStream.h
index 7551bfd7cf50c8bce1f89955ddaa14c6873d3f2b..f1c9bd3e3cefdd42061a295e720890ffd0e48f73 100644
(file)
--- a/
cde/programs/nsgmls/OutputCharStream.h
+++ b/
cde/programs/nsgmls/OutputCharStream.h
@@
-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
@@
#include "Owner.h"
#include "CodingSystem.h"
#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
#include <streambuf>
using namespace std;
#else