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