You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pi...@apache.org on 2007/12/06 11:44:43 UTC
svn commit: r601690 - in /webservices/axis2/trunk/c: axiom/configure.ac
axiom/src/om/om_stax_builder.c configure.ac guththila/configure.ac
Author: pini
Date: Thu Dec 6 02:44:42 2007
New Revision: 601690
URL: http://svn.apache.org/viewvc?rev=601690&view=rev
Log:
Fixing jira issue 808
Modified:
webservices/axis2/trunk/c/axiom/configure.ac
webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
webservices/axis2/trunk/c/configure.ac
webservices/axis2/trunk/c/guththila/configure.ac
Modified: webservices/axis2/trunk/c/axiom/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/configure.ac?rev=601690&r1=601689&r2=601690&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/configure.ac (original)
+++ webservices/axis2/trunk/c/axiom/configure.ac Thu Dec 6 02:44:42 2007
@@ -104,6 +104,7 @@
;;
*)
AC_MSG_RESULT(yes)
+ CFLAGS="$CFLAGS -DAXIS2_GUTHTHILA_ENABLED"
WRAPPER_DIR="guththila"
;;
Modified: webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c?rev=601690&r1=601689&r2=601690&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c Thu Dec 6 02:44:42 2007
@@ -427,7 +427,7 @@
axutil_string_free(temp_ns_uri_str, env);
axutil_string_free(temp_ns_prefix_str, env);
#ifdef WIN32
- axiom_xml_reader_xml_free(om_builder->parser, env, temp_ns_uri);
+ axiom_xml_reader_xml_free(om_builder->parser, env, temp_ns_uri);
axiom_xml_reader_xml_free(om_builder->parser, env, temp_ns_prefix);
#endif
if (!om_ns)
@@ -461,19 +461,11 @@
return AXIS2_FAILURE;
}
}
-#ifdef WIN32
- if (temp_prefix)
- {
- axiom_xml_reader_xml_free(om_builder->parser, env, temp_prefix);
- }
-#else
- if(temp_prefix)
- {
- AXIS2_FREE(env->allocator,temp_prefix);
- }
-#endif
-
-
+#ifdef AXIS2_GUTHTHILA_ENABLED
+ AXIS2_FREE(env->allocator,temp_prefix);
+#else
+ axiom_xml_reader_xml_free(om_builder->parser, env, temp_prefix);
+#endif
return status;
}
@@ -624,11 +616,16 @@
}
om_builder->element_level++;
-#ifdef WIN32
- axiom_xml_reader_xml_free(om_builder->parser, env, comment_value);
+
+#ifdef AXIS2_GUTHTHILA_ENABLED
+
+ AXIS2_FREE(env->allocator,comment_value);
+
#else
-/* AXIS2_FREE(env->allocator,comment_value);*/
-#endif
+
+ axiom_xml_reader_xml_free(om_builder->parser,env,comment_value);
+
+#endif
om_builder->lastnode = comment_node;
Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?rev=601690&r1=601689&r2=601690&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Thu Dec 6 02:44:42 2007
@@ -164,14 +164,15 @@
;;
*)
AC_MSG_RESULT(yes)
+ CFLAGS="$CFLAGS -DAXIS2_GUTHTHILA_ENABLED"
WRAPPER_DIR="guththila"
if test -d $srcdir/guththila; then
AC_CONFIG_SUBDIRS(guththila)
fi
-
+
GUTHTHILA_LIBS="/guththila/src/"
GUTHTHILA_DIR="guththila"
-
+
;;
esac ],
AC_MSG_RESULT(no)
Modified: webservices/axis2/trunk/c/guththila/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/configure.ac?rev=601690&r1=601689&r2=601690&view=diff
==============================================================================
--- webservices/axis2/trunk/c/guththila/configure.ac (original)
+++ webservices/axis2/trunk/c/guththila/configure.ac Thu Dec 6 02:44:42 2007
@@ -48,7 +48,8 @@
dnl Checks for libraries.
AC_CHECK_LIB(dl, dlopen)
-CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
+CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE -DAXIS2_GUTHTHILA_ENABLED"
+
if test "$GCC" = "yes"; then
CFLAGS="$CFLAGS -ansi -ggdb3 -Wall -Wno-implicit-function-declaration "
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org