[jbossnative-commits] JBoss Native SVN: r951 - in trunk/sight/native: share and 1 other directory.
Author: jfrederic.clere(a)jboss.com
Date: 2007-08-21 05:38:41 -0400 (Tue, 21 Aug 2007)
New Revision: 951
Modified:
trunk/sight/native/include/sight_types.h
trunk/sight/native/share/hash.c
trunk/sight/native/share/jnu.c
Log:
The union in sight_str_t needs to have a name otherwise it
won't compile on Solaris compiler (and lot others).
Modified: trunk/sight/native/include/sight_types.h
===================================================================
--- trunk/sight/native/include/sight_types.h 2007-08-20 10:33:32 UTC (rev 950)
+++ trunk/sight/native/include/sight_types.h 2007-08-21 09:38:41 UTC (rev 951)
@@ -93,7 +93,7 @@
union {
char *c;
jchar *w;
- };
+ } str;
} sight_str_t;
#define SIGHT_ARR_CCHAR 0x01000000
Modified: trunk/sight/native/share/hash.c
===================================================================
--- trunk/sight/native/share/hash.c 2007-08-20 10:33:32 UTC (rev 950)
+++ trunk/sight/native/share/hash.c 2007-08-21 09:38:41 UTC (rev 951)
@@ -77,7 +77,7 @@
{
sight_str_t rv;
rv.len = 0;
- rv.c = (char *)apr_table_get(table, key);
+ rv.str.c = (char *)apr_table_get(table, key);
return rv;
}
Modified: trunk/sight/native/share/jnu.c
===================================================================
--- trunk/sight/native/share/jnu.c 2007-08-20 10:33:32 UTC (rev 950)
+++ trunk/sight/native/share/jnu.c 2007-08-21 09:38:41 UTC (rev 951)
@@ -184,7 +184,7 @@
const jchar *p = s;
str.len = 0;
- str.w = NULL;
+ str.str.w = NULL;
if (p == NULL) {
return str;
}
@@ -192,9 +192,9 @@
siz += sizeof(jchar);
str.len++;
}
- str.w = calloc(1, siz);
- if (str.w && str.len)
- memcpy(str.w, s, str.len * sizeof(jchar));
+ str.str.w = calloc(1, siz);
+ if (str.str.w && str.len)
+ memcpy(str.str.w, s, str.len * sizeof(jchar));
return str;
}