I have not done anything do configure, so --without-included-string is
needed.

        Lgb

Index: src/paragraph.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/paragraph.C,v
retrieving revision 1.74.2.1
diff -u -p -r1.74.2.1 paragraph.C
--- src/paragraph.C     2000/09/29 15:14:34     1.74.2.1
+++ src/paragraph.C     2000/12/05 17:15:18
@@ -4021,7 +4021,7 @@ LyXParagraph * LyXParagraph::TeXFootnote
                                "Footnote in a Footnote -- not supported"
                               << endl;
                }
-#ifndef HAVE_OSTREAM
+#ifndef HAVE_SSTREAM
                delete [] dummy.str();
 #endif
        }                                                                       Index: 
src/support/lstrings.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/lstrings.C,v
retrieving revision 1.22.2.1
diff -u -p -r1.22.2.1 lstrings.C
--- src/support/lstrings.C      2000/10/04 10:53:36     1.22.2.1
+++ src/support/lstrings.C      2000/12/05 17:15:18
@@ -175,8 +175,13 @@ bool prefixIs(string const & a, char con
        unsigned int l = strlen(pre);
        if (l > a.length() || a.empty())
                return false;
-       else
+       else {
+#if !defined(USE_INCLUDED_STRING)
+               return ::strncmp(a.c_str(), pre, l) == 0;
+#else
                return a.compare(0, l, pre, l) == 0;
+#endif
+       }
 }
 
                                                                                @@ 
-193,7 +198,12 @@ bool suffixIs(string const & a, char con
        if (suflen > a.length())
                return false;
        else {
+#if !defined(USE_INCLUDED_STRING)
+               string const tmp(a, a.length() - suflen);
+               return ::strncmp(tmp.c_str(), suf, suflen) == 0;
+#else
                return a.compare(a.length() - suflen, suflen, suf) == 0;
+#endif
        }
 }
                                                                                

Reply via email to