|
0
|
1 |
--- konkretcmpi-0.8.7/configure.ac 2008-10-22 17:56:00.000000000 -0700
|
|
|
2 |
+++ konkretcmpi-0.8.7-new/configure.ac 2008-11-18 21:43:11.681837592 -0800
|
|
|
3 |
@@ -99,8 +99,13 @@ fi
|
|
|
4 |
##
|
|
|
5 |
##=============================================================================
|
|
|
6 |
|
|
|
7 |
-CXXFLAGS="$CXXFLAGS -fPIC -Wall"
|
|
|
8 |
-CFLAGS="$CFLAGS -fPIC -Wall"
|
|
|
9 |
+if test "$GCC" = yes; then
|
|
|
10 |
+ CXXFLAGS="$CXXFLAGS -fPIC -Wall"
|
|
|
11 |
+ CFLAGS="$CFLAGS -fPIC -Wall"
|
|
|
12 |
+else
|
|
|
13 |
+ CXXFLAGS="$CXXFLAGS"
|
|
|
14 |
+ CFLAGS="$CFLAGS"
|
|
|
15 |
+fi
|
|
|
16 |
|
|
|
17 |
##=============================================================================
|
|
|
18 |
##
|
|
|
19 |
--- konkretcmpi-0.8.7/src/konkret/general.c 2008-06-06 15:34:23.000000000 -0700
|
|
|
20 |
+++ konkretcmpi-0.8.7-new/src/konkret/general.c 2008-11-18 21:43:11.683100293 -0800
|
|
|
21 |
@@ -435,7 +435,11 @@ CMPIStatus KBase_SetToArgs(
|
|
|
22 |
|
|
|
23 |
if (!KOkay(st))
|
|
|
24 |
{
|
|
|
25 |
+# if defined(__SUNPRO_C)
|
|
|
26 |
+ printf("%s() failed on %s\n", __func__, pos.name);
|
|
|
27 |
+# else
|
|
|
28 |
printf("%s() failed on %s\n", __FUNCTION__, pos.name);
|
|
|
29 |
+#endif
|
|
|
30 |
}
|
|
|
31 |
}
|
|
|
32 |
while (0);
|
|
|
33 |
--- konkretcmpi-0.8.7/src/mof/MOF_Config.h 2008-06-06 15:34:23.000000000 -0700
|
|
|
34 |
+++ konkretcmpi-0.8.7-new/src/mof/MOF_Config.h 2008-11-18 21:43:11.685647174 -0800
|
|
|
35 |
@@ -34,6 +34,10 @@
|
|
|
36 |
#include <cstdlib>
|
|
|
37 |
#include <cstring>
|
|
|
38 |
|
|
|
39 |
+#if defined(__SUNPRO_CC)
|
|
|
40 |
+# include <iostream>
|
|
|
41 |
+#endif
|
|
|
42 |
+
|
|
|
43 |
#if defined(__GNUC__) && (__GNUC__ >= 4)
|
|
|
44 |
# define MOF_PRINTF_ATTR(A1, A2) __attribute__((format (printf, A1, A2)))
|
|
|
45 |
#else
|
|
|
46 |
--- konkretcmpi-0.8.7/src/program/main.cpp 2008-09-19 10:29:47.000000000 -0700
|
|
|
47 |
+++ konkretcmpi-0.8.7-new/src/program/main.cpp 2008-11-18 21:47:33.134913972 -0800
|
|
|
48 |
@@ -410,7 +410,12 @@ static void pack_name(vector<unsigned ch
|
|
|
49 |
size_t n = strlen(name);
|
|
|
50 |
assert(n < 256);
|
|
|
51 |
sig.push_back(n);
|
|
|
52 |
+# if defined(__SUNPRO_CC)
|
|
|
53 |
+ for (int i=0; i < n + 1; i++)
|
|
|
54 |
+ sig.push_back(name[i]);
|
|
|
55 |
+# else
|
|
|
56 |
sig.insert(sig.end(), name, name + n + 1);
|
|
|
57 |
+# endif
|
|
|
58 |
}
|
|
|
59 |
|
|
|
60 |
static void gen_feature_decls(
|
|
|
61 |
@@ -2445,7 +2450,7 @@ int main(int argc, char** argv)
|
|
|
62 |
" -v Print the version\n"
|
|
|
63 |
" -s CLASS Write provider skeleton for CLASS to <ALIAS>Provider.c\n"
|
|
|
64 |
" (or use CLASS=ALIAS! form instead).\n"
|
|
|
65 |
- " -f FILE Read CLASS=ALIAS[!] argumetns the given file.\n"
|
|
|
66 |
+ " -f FILE Read CLASS=ALIAS[!] arguments in the given file.\n"
|
|
|
67 |
" -h Print this help message\n"
|
|
|
68 |
"\n"
|
|
|
69 |
"ENVIRONMENT VARIABLES:\n"
|
|
|
70 |
--- konkretcmpi-0.8.7/src/konkretreg/main.cpp 2008-12-19 23:50:32.435480856 -0800
|
|
|
71 |
+++ konkretcmpi-0.8.7-new/src/konkretreg/main.cpp 2008-12-19 23:53:30.471747867 -0800
|
|
|
72 |
@@ -67,7 +67,7 @@ int main(int argc, char** argv)
|
|
|
73 |
"Usage: %s [OPTIONS] PROVIDER_LIBRARY\n"
|
|
|
74 |
"\n"
|
|
|
75 |
"SYNOPSIS:\n"
|
|
|
76 |
- " Generates an SFCB-style .reg file by default\n"
|
|
|
77 |
+ " Generates an SFCB-style .reg file format by default\n"
|
|
|
78 |
"\n"
|
|
|
79 |
"OPTIONS:\n"
|
|
|
80 |
" -n NS1=NS2 -- register providers marked for namespace NS1 into\n"
|
|
|
81 |
--- konkretcmpi-0.8.7/src/konkret/Makefile.am 2009-05-13 23:54:52.933242914 -0700
|
|
|
82 |
+++ konkretcmpi-0.8.7-new/src/konkret/Makefile.am 2009-05-12 23:19:54.291739567 -0700
|
|
|
83 |
@@ -1,12 +1,11 @@
|
|
|
84 |
-lib_LIBRARIES = libkonkret.a
|
|
|
85 |
+lib_LTLIBRARIES = libkonkret.la
|
|
|
86 |
|
|
|
87 |
-libkonkret_a_SOURCES = \
|
|
|
88 |
+libkonkret_la_SOURCES = \
|
|
|
89 |
defaultassoc.c \
|
|
|
90 |
defaultei.c \
|
|
|
91 |
defaultein.c \
|
|
|
92 |
defaultgi.c \
|
|
|
93 |
general.c \
|
|
|
94 |
- konkret.h \
|
|
|
95 |
print.c \
|
|
|
96 |
kstr.c
|
|
|
97 |
|
|
|
98 |
--- konkretcmpi-0.8.7/src/konkret/konkret.h 2009-05-13 23:53:29.293927061 -0700
|
|
|
99 |
+++ konkretcmpi-0.8.7-new/src/konkret/konkret.h 2009-05-12 23:20:32.076937679 -0700
|
|
|
100 |
@@ -46,7 +46,7 @@
|
|
|
101 |
|
|
|
102 |
#define KONKRET_MAJOR 0
|
|
|
103 |
#define KONKRET_MINOR 8
|
|
|
104 |
-#define KONKRET_REVISION 6
|
|
|
105 |
+#define KONKRET_REVISION 7
|
|
|
106 |
|
|
|
107 |
#define KONKRET_VERSION \
|
|
|
108 |
((KONKRET_MAJOR << 24) | (KONKRET_MINOR << 16) | (KONKRET_REVISION << 8))
|
|
|
109 |
@@ -67,8 +67,11 @@
|
|
|
110 |
**
|
|
|
111 |
**==============================================================================
|
|
|
112 |
*/
|
|
|
113 |
-
|
|
|
114 |
+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
|
|
|
115 |
+#define KHIDE __hidden
|
|
|
116 |
+#else
|
|
|
117 |
#define KHIDE __attribute__((visibility("hidden")))
|
|
|
118 |
+#endif
|
|
|
119 |
|
|
|
120 |
/*
|
|
|
121 |
**==============================================================================
|
|
|
122 |
@@ -78,7 +81,7 @@
|
|
|
123 |
**==============================================================================
|
|
|
124 |
*/
|
|
|
125 |
|
|
|
126 |
-#define KEXTERN KHIDE extern
|
|
|
127 |
+#define KEXTERN extern
|
|
|
128 |
|
|
|
129 |
/*
|
|
|
130 |
**==============================================================================
|
|
|
131 |
@@ -91,6 +94,8 @@
|
|
|
132 |
#ifndef KINLINE
|
|
|
133 |
# if defined(__GNUC__)
|
|
|
134 |
# define KINLINE static __inline__
|
|
|
135 |
+# elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
|
|
|
136 |
+# define KINLINE static inline
|
|
|
137 |
# else
|
|
|
138 |
# define KINLINE static
|
|
|
139 |
# endif
|