adjust config.h to correspond to what gcc actually does.

Suppresses most of the warnings.
This commit is contained in:
espie 2005-08-10 09:59:13 +00:00
parent 241f525d5f
commit b2acde38da
3 changed files with 20 additions and 14 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.17 2004/12/07 00:23:23 alek Exp $ # $OpenBSD: Makefile,v 1.18 2005/08/10 09:59:13 espie Exp $
COMMENT= "OO toolkit for SGML parsing and entity management" COMMENT= "OO toolkit for SGML parsing and entity management"
DISTNAME= sp-1.3.4 DISTNAME= sp-1.3.4
PKGNAME= ${DISTNAME}p0
CATEGORIES= textproc CATEGORIES= textproc
HOMEPAGE= http://www.jclark.com/sp/ HOMEPAGE= http://www.jclark.com/sp/

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-include_Attribute_h,v 1.1 2004/01/14 20:24:31 naddy Exp $ $OpenBSD: patch-include_Attribute_h,v 1.2 2005/08/10 09:59:13 espie Exp $
--- include/Attribute.h.orig 2004-01-14 21:09:00.000000000 +0100 --- include/Attribute.h.orig Tue Dec 16 09:49:29 1997
+++ include/Attribute.h 2004-01-14 21:10:44.000000000 +0100 +++ include/Attribute.h Wed Aug 10 11:43:30 2005
@@ -31,6 +31,27 @@ class AttributeSemantics; @@ -31,6 +31,27 @@ class AttributeSemantics;
class AttributeContext; class AttributeContext;
class Syntax; class Syntax;
@ -29,10 +29,12 @@ $OpenBSD: patch-include_Attribute_h,v 1.1 2004/01/14 20:24:31 naddy Exp $
class SP_API AttributeDefinitionDesc { class SP_API AttributeDefinitionDesc {
public: public:
AttributeDefinitionDesc() { } AttributeDefinitionDesc() { }
@@ -373,27 +394,6 @@ private: @@ -371,27 +392,6 @@ public:
AttributeSemantics *copy() const;
private:
ConstPtr<Notation> notation_; ConstPtr<Notation> notation_;
}; -};
-
-class SP_API AttributeValue : public Resource { -class SP_API AttributeValue : public Resource {
-public: -public:
- enum Type { - enum Type {
@ -52,8 +54,6 @@ $OpenBSD: patch-include_Attribute_h,v 1.1 2004/01/14 20:24:31 naddy Exp $
- virtual Boolean recoverUnquoted(const StringC &, const Location &, - virtual Boolean recoverUnquoted(const StringC &, const Location &,
- AttributeContext &, const StringC &); - AttributeContext &, const StringC &);
- static Boolean handleAsUnterminated(const Text &, AttributeContext &); - static Boolean handleAsUnterminated(const Text &, AttributeContext &);
-}; };
-
class SP_API ImpliedAttributeValue : public AttributeValue { class SP_API ImpliedAttributeValue : public AttributeValue {
public:
ImpliedAttributeValue();

View File

@ -1,12 +1,17 @@
$OpenBSD: patch-include_config_h,v 1.1 2002/10/16 00:49:04 naddy Exp $ $OpenBSD: patch-include_config_h,v 1.2 2005/08/10 09:59:13 espie Exp $
--- include/config.h.orig Wed Oct 13 07:02:46 1999 --- include/config.h.orig Wed Oct 13 07:02:46 1999
+++ include/config.h Wed Oct 16 02:07:51 2002 +++ include/config.h Wed Aug 10 11:47:51 2005
@@ -26,7 +26,7 @@ @@ -26,8 +26,12 @@
#endif #endif
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8) #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
#define SP_ANSI_LIB #define SP_ANSI_LIB
-#define SP_NO_STD_NAMESPACE -#define SP_NO_STD_NAMESPACE
+// #define SP_NO_STD_NAMESPACE +// #define SP_NO_STD_NAMESPACE
#undef SP_NEW_H_MISSING #undef SP_NEW_H_MISSING
+#endif
+#if __GNUC__ > 2
+#define SP_HAVE_TYPENAME
+#define SP_HAVE_PLACEMENT_OPERATOR_DELETE
#endif #endif
#endif /* __GNUG__ */