|
1 # Existing set of patches from the desktop gate for building with Studio |
|
2 # Since this is for our build, probably not something we can get upstream. |
|
3 |
|
4 --- OpenSP-1.5.1/configure.in-orig 2003-09-03 10:34:16.000000000 -0500 |
|
5 +++ OpenSP-1.5.1/configure.in 2009-01-22 16:07:11.334969000 -0600 |
|
6 @@ -163,8 +163,8 @@ AH_BOTTOM([ |
|
7 #endif /* HAVE_PATHNAME_STYLE_DOS */ |
|
8 |
|
9 #ifdef HAVE_INSTANTIATIONS |
|
10 -#ifndef SP_ANSI_CLASS_INST |
|
11 -#define SP_ANSI_CLASS_INST |
|
12 +#ifdef SP_ANSI_CLASS_INST |
|
13 +#undef SP_ANSI_CLASS_INST |
|
14 #endif |
|
15 #endif /* HAVE_INSTANTIATIONS */ |
|
16 |
|
17 @@ -352,14 +355,8 @@ dnl FIXME these need tests for non-GNU c |
|
18 ac_cv_c_gnu_automatic_templates=yes, |
|
19 ac_cv_c_gnu_automatic_templates=no) |
|
20 ]) |
|
21 - if test "$ac_cv_c_gnu_automatic_templates" = yes; then |
|
22 - AC_DEFINE(SP_DEFINE_TEMPLATES,1, |
|
23 + AC_DEFINE(SP_DEFINE_TEMPLATES,1, |
|
24 [define this to include template definitions in the headers]) |
|
25 - else |
|
26 - AC_DEFINE(SP_MANUAL_INST,1, |
|
27 - [define this to compile explicit template instantiations]) |
|
28 - CXXFLAGS="$CXXFLAGS -fno-implicit-templates" |
|
29 - fi |
|
30 AC_CACHE_CHECK(whether GNU C++ links with libg++ if we include new.h, |
|
31 ac_cv_cxx_gnu_avoid_new_h, |
|
32 [AC_EGREP_CPP(yes,[ |
|
33 --- OpenSP.orig/lib/SearchResultMessageArg.cxx Tue Dec 23 21:21:50 2003 |
|
34 +++ OpenSP/lib/SearchResultMessageArg.cxx Tue Dec 23 22:51:41 2003 |
|
35 @@ -12,7 +12,7 @@ |
|
36 namespace SP_NAMESPACE { |
|
37 #endif |
|
38 |
|
39 -RTTI_DEF1(SearchResultMessageArg, OtherMessageArg); |
|
40 +RTTI_DEF1(SearchResultMessageArg, OtherMessageArg) |
|
41 |
|
42 SearchResultMessageArg::SearchResultMessageArg() |
|
43 { |
|
44 --- OpenSP-1.5.1/sx/XmlOutputEventHandler.cxx.orig Thu Sep 29 09:08:41 2005 |
|
45 +++ OpenSP-1.5.1/sx/XmlOutputEventHandler.cxx Thu Sep 29 09:12:14 2005 |
|
46 @@ -106,7 +106,7 @@ |
|
47 // Open file for writing external entity declarations if we are preserving |
|
48 // any entities |
|
49 if (! options_.expExt) { |
|
50 - ParserApp::AppChar filePath[strlen(outputDir_) + 21]; |
|
51 + char *filePath = (char *)malloc (strlen(outputDir_) + 21); |
|
52 strcpy (filePath, outputDir_); |
|
53 strcat (filePath, "/"); |
|
54 strcat (filePath, EXT_ENT_FILE); |
|
55 @@ -140,7 +140,7 @@ |
|
56 // Open file for writing external entity declarations if we are preserving |
|
57 // any entities |
|
58 if (! options_.expInt) { |
|
59 - char filePath[strlen(outputDir_) + 21]; |
|
60 + char *filePath = (char *)malloc (strlen(outputDir_) + 21); |
|
61 strcpy (filePath, outputDir_); |
|
62 strcat (filePath, "/"); |
|
63 strcat (filePath, INT_ENT_FILE); |
|
64 @@ -1153,9 +1153,9 @@ |
|
65 becomes ./usr/local/lib/ents/foo.xml; possible 2-digit |
|
66 suffix (for uniqueness) */ |
|
67 |
|
68 - char filePath[strlen(outputDir_) + 9 + |
|
69 + char *filePath = (char *)malloc (strlen(outputDir_) + 9 + |
|
70 outputCodingSystem->convertOut |
|
71 - (*systemIdPointer).size()]; |
|
72 + (*systemIdPointer).size()); |
|
73 |
|
74 strcpy (filePath, outputDir_); |
|
75 |
|
76 @@ -1505,7 +1505,7 @@ |
|
77 */ |
|
78 void XmlOutputEventHandler::uniqueFilename(char *filePath) { |
|
79 |
|
80 - char baseFilePath[strlen(filePath)]; |
|
81 + char *baseFilePath = (char *)malloc (strlen(filePath)); |
|
82 strcpy (baseFilePath, filePath); |
|
83 |
|
84 struct stat statbuf; |