15713N/A--- OpenSP-1.5.1/configure.in-orig 2003-09-03 10:34:16.000000000 -0500

15713N/A+++ OpenSP-1.5.1/configure.in 2009-01-22 16:07:11.334969000 -0600

15713N/A@@ -163,8 +163,8 @@ AH_BOTTOM([

10139N/A #endif /* HAVE_PATHNAME_STYLE_DOS */

10139N/A

10139N/A #ifdef HAVE_INSTANTIATIONS

10139N/A-#ifndef SP_ANSI_CLASS_INST

10139N/A-#define SP_ANSI_CLASS_INST

10139N/A+#ifdef SP_ANSI_CLASS_INST

10139N/A+#undef SP_ANSI_CLASS_INST

10139N/A #endif

10139N/A #endif /* HAVE_INSTANTIATIONS */

10139N/A

15713N/A@@ -239,6 +239,9 @@ AM_PROG_LIBTOOL

10139N/A dnl Checks for libraries.

10139N/A AC_CHECK_LIB(pthread,pthread_create,,AC_CHECK_LIB(threads,cthread_fork))

10139N/A

15713N/A+dnl *** check for socket library ***

15713N/A+AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)])

15713N/A+

10139N/A ALL_LINGUAS="de fr ja sv"

10139N/A AM_GNU_GETTEXT

15713N/A AC_CHECK_HEADERS(locale.h)

15713N/A@@ -352,14 +355,8 @@ dnl FIXME these need tests for non-GNU c

10139N/A ac_cv_c_gnu_automatic_templates=yes,

10139N/A ac_cv_c_gnu_automatic_templates=no)

10139N/A ])

10139N/A- if test "$ac_cv_c_gnu_automatic_templates" = yes; then

10139N/A- AC_DEFINE(SP_DEFINE_TEMPLATES,1,

10139N/A+ AC_DEFINE(SP_DEFINE_TEMPLATES,1,

10139N/A [define this to include template definitions in the headers])

10139N/A- else

10139N/A- AC_DEFINE(SP_MANUAL_INST,1,

10139N/A- [define this to compile explicit template instantiations])

10139N/A- CXXFLAGS="$CXXFLAGS -fno-implicit-templates"

10139N/A- fi

10139N/A AC_CACHE_CHECK(whether GNU C++ links with libg++ if we include new.h,

10139N/A ac_cv_cxx_gnu_avoid_new_h,

10139N/A [AC_EGREP_CPP(yes,[

10139N/A--- OpenSP.orig/lib/SearchResultMessageArg.cxx Tue Dec 23 21:21:50 2003

10139N/A+++ OpenSP/lib/SearchResultMessageArg.cxx Tue Dec 23 22:51:41 2003

10139N/A@@ -12,7 +12,7 @@

10139N/A namespace SP_NAMESPACE {

10139N/A #endif

10139N/A

10139N/A-RTTI_DEF1(SearchResultMessageArg, OtherMessageArg);

10139N/A+RTTI_DEF1(SearchResultMessageArg, OtherMessageArg)

10139N/A

10139N/A SearchResultMessageArg::SearchResultMessageArg()

10139N/A {

10139N/A--- OpenSP-1.5.1/sx/XmlOutputEventHandler.cxx.orig Thu Sep 29 09:08:41 2005

10139N/A+++ OpenSP-1.5.1/sx/XmlOutputEventHandler.cxx Thu Sep 29 09:12:14 2005

10139N/A@@ -106,7 +106,7 @@

10139N/A // Open file for writing external entity declarations if we are preserving

10139N/A // any entities

10139N/A if (! options_.expExt) {

10139N/A- ParserApp::AppChar filePath[strlen(outputDir_) + 21];

10139N/A+ char *filePath = (char *)malloc (strlen(outputDir_) + 21);

10139N/A strcpy (filePath, outputDir_);

10139N/A strcat (filePath, "/");

10139N/A strcat (filePath, EXT_ENT_FILE);

10139N/A@@ -140,7 +140,7 @@

10139N/A // Open file for writing external entity declarations if we are preserving

10139N/A // any entities

10139N/A if (! options_.expInt) {

10139N/A- char filePath[strlen(outputDir_) + 21];

10139N/A+ char *filePath = (char *)malloc (strlen(outputDir_) + 21);

10139N/A strcpy (filePath, outputDir_);

10139N/A strcat (filePath, "/");

10139N/A strcat (filePath, INT_ENT_FILE);

10139N/A@@ -1153,9 +1153,9 @@

10139N/A becomes ./usr/local/lib/ents/foo.xml; possible 2-digit

10139N/A suffix (for uniqueness) */

10139N/A

10139N/A- char filePath[strlen(outputDir_) + 9 +

10139N/A+ char *filePath = (char *)malloc (strlen(outputDir_) + 9 +

10139N/A outputCodingSystem->convertOut

10139N/A- (*systemIdPointer).size()];

10139N/A+ (*systemIdPointer).size());

10139N/A

10139N/A strcpy (filePath, outputDir_);

10139N/A

10139N/A@@ -1505,7 +1505,7 @@

10139N/A */

10139N/A void XmlOutputEventHandler::uniqueFilename(char *filePath) {

10139N/A

10139N/A- char baseFilePath[strlen(filePath)];

10139N/A+ char *baseFilePath = (char *)malloc (strlen(filePath));

10139N/A strcpy (baseFilePath, filePath);

10139N/A

10139N/A struct stat statbuf;