axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r328244 - in /webservices/axis2/trunk/c: include/axis2_om_output.h modules/test/om/src/Makefile.am modules/xml/om/src/axis2_om_output.c
Date Tue, 25 Oct 2005 03:18:23 GMT
Author: samisa
Date: Mon Oct 24 20:18:13 2005
New Revision: 328244

URL: http://svn.apache.org/viewcvs?rev=328244&view=rev
Log:
Fixed guththila environment related problems

Modified:
    webservices/axis2/trunk/c/include/axis2_om_output.h
    webservices/axis2/trunk/c/modules/test/om/src/Makefile.am
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c

Modified: webservices/axis2/trunk/c/include/axis2_om_output.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_output.h?rev=328244&r1=328243&r2=328244&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_output.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_output.h Mon Oct 24 20:18:13 2005
@@ -66,11 +66,12 @@
     * @param environment Environment. MUST NOT be NULL, if NULL behaviour is undefined.
     * @param xml_writer XML writer. Optional, can be NULL. If NULL default xml writer
     *           (guththila writer ) will be created with stdout as the output stream
+	* @param writer_env writer envioronment. Optional, can be NULL.
     * @return a pointer to newly created output struct.
     */
 
     axis2_om_output_t *axis2_create_om_output (axis2_environment_t *
-                                               environment, void *xml_writer);
+                                               environment, void *xml_writer, void* writer_env);
 
   /**
     *  Performs xml writing.

Modified: webservices/axis2/trunk/c/modules/test/om/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/om/src/Makefile.am?rev=328244&r1=328243&r2=328244&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/om/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/test/om/src/Makefile.am Mon Oct 24 20:18:13 2005
@@ -4,19 +4,9 @@
 AM_CPPFLAGS = $(CPPFLAGS) -g -O2 -pthread
 test_om_SOURCES = test_om.c
 
-<<<<<<< .mine
 test_om_LDADD   =  $(LDFLAGS) -L$(top_builddir)/modules/xml/om/src/.libs -laxis2_om \
                     -L$(top_builddir)/modules/xml/guththila/src/.libs -lguththila \
                     -L$(top_builddir)/modules/util/src/.libs -laxis2_util
                     
-=======
-#test_om_LDADD   =  $(LDFLAGS) $(top_builddir)/modules/xml/om/src/libaxis2_om.la \
-#                    $(top_builddir)/modules/xml/guththila/src/libguththila.la
-
-test_om_LDADD = $(LDFLAGS) -L$(top_builddir)/modules/xml/om/src/.libs -laxis2_om \
-                    -L$(top_builddir)/modules/xml/guththila/src/.libs -lguththila \
-                    -L$(top_builddir)/modules/util/src/.libs -laxis2_util
-
->>>>>>> .r328240
 INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
             -I$(top_builddir)/modules/xml/guththila/src

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c?rev=328244&r1=328243&r2=328244&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c Mon Oct 24 20:18:13 2005
@@ -24,7 +24,7 @@
 guththila_allocator_t *om_output_guththila_allocator = NULL;
 
 axis2_om_output_t *
-axis2_create_om_output (axis2_environment_t * environment, void *xml_writer)
+axis2_create_om_output (axis2_environment_t * environment, void *xml_writer, void* writer_env)
 {
     axis2_om_output_t *om_output =
         (axis2_om_output_t *) axis2_malloc (environment->allocator,
@@ -38,7 +38,11 @@
 
     om_output->xml_writer = NULL;
     if (xml_writer)
+	{
         om_output->xml_writer = xml_writer;
+		if (writer_env)
+			om_output_guththila_environment = (guththila_environment_t*)writer_env;
+	}
     else
 	{
 		



Mime
View raw message