[prev in list] [next in list] [prev in thread] [next in thread] 

List:       axis-c-dev
Subject:    small patch
From:       Rob Savoye <rob () senecass ! com>
Date:       2010-07-16 18:16:00
Message-ID: 4C40A1E0.1060303 () senecass ! com
[Download RAW message or body]

Here's a small patch so axis2c links when using the new Gold linker with
--as-needed. This primarily consisted of adding a few more libraries at
link time to a few test cases. The other eliminates a few compiler
warnings, which when built with -Wall, become errors, and stops the build.

	- rob -

["axis2c-1.6.0.patch" (text/x-patch)]

--- axis2c-1.6.0-orig/axiom/test/util/Makefile.am	2009-04-05 22:48:14.000000000 -0600
+++ axis2c-1.6.0-new/axiom/test/util/Makefile.am	2010-07-16 11:44:25.000000000 -0600
@@ -1,7 +1,9 @@
 noinst_PROGRAMS = axiom
 axiom_SOURCES = axiom_util_test.c
 axiom_LDADD   =   \
-                    $(top_builddir)/src/om/libaxis2_axiom.la 
+                    $(top_builddir)/src/om/libaxis2_axiom.la \
+                    $(top_builddir)/src/parser/guththila/libaxis2_parser.la \
+                    $(top_builddir)/../util/src/libaxutil.la
 
 INCLUDES = -I$(top_builddir)/include \
 			-I ../../../util/include \
--- axis2c-1.6.0-orig/axiom/test/util/axiom_util_test.c	2010-07-16 12:03:37.000000000 \
                -0600
+++ axis2c-1.6.0-new/axiom/test/util/axiom_util_test.c	2010-07-16 12:04:12.000000000 \
-0600 @@ -3,6 +3,8 @@
 #include <axiom.h>
 #include <axis2_util.h>
 #include <axiom_node.h>
+#include <axiom_xml_reader.h>	/* FIXME */
+
 #include "../../../util/test/util/create_env.h"
     FILE *f = NULL;
     axiom_node_t *node = NULL;
--- axis2c-1.6.0-orig/neethi/test/Makefile.am	2009-04-05 22:46:59.000000000 -0600
+++ axis2c-1.6.0-new/neethi/test/Makefile.am	2010-07-16 11:50:08.000000000 -0600
@@ -12,5 +12,6 @@
 
 test_LDADD = $(top_builddir)/src/libneethi.la \
 			../../axiom/src/om/libaxis2_axiom.la \
+			../../axiom/src/parser/guththila/libaxis2_parser.la \
 			../../util/src/libaxutil.la \
 			../src/libneethi.la
--- axis2c-1.6.0-orig/src/core/clientapi/listener_manager.c	2009-04-05 \
                22:46:39.000000000 -0600
+++ axis2c-1.6.0-new/src/core/clientapi/listener_manager.c	2010-07-16 \
11:53:24.000000000 -0600 @@ -127,7 +127,7 @@
                 listener = axis2_transport_in_desc_get_recv(transport_in, env);
                 if (listener)
                 {
-                    axutil_thread_t *worker_thread = NULL;
+                    /* axutil_thread_t *worker_thread = NULL; FIXME: unused */
                     axis2_listener_manager_worker_func_args_t *arg_list = NULL;
                     arg_list = AXIS2_MALLOC(env->allocator,
                                             sizeof
--- axis2c-1.6.0-orig/src/core/clientapi/op_client.c	2009-04-05 22:46:39.000000000 \
                -0600
+++ axis2c-1.6.0-new/src/core/clientapi/op_client.c	2010-07-16 11:54:11.000000000 \
-0600 @@ -531,7 +531,7 @@
         }
         else
         {
-            axutil_thread_t *worker_thread = NULL;
+            /* axutil_thread_t *worker_thread = NULL; FIXME: unused */
             axis2_op_client_worker_func_args_t *arg_list = NULL;
             arg_list = AXIS2_MALLOC(env->allocator,
                                     sizeof(axis2_op_client_worker_func_args_t));
--- axis2c-1.6.0-orig/src/core/transport/http/receiver/http_svr_thread.c	2009-04-05 \
                22:46:43.000000000 -0600
+++ axis2c-1.6.0-new/src/core/transport/http/receiver/http_svr_thread.c	2010-07-16 \
11:56:22.000000000 -0600 @@ -123,7 +123,7 @@
     {
         int socket = -1;
         axis2_http_svr_thd_args_t *arg_list = NULL;
-        axutil_thread_t *worker_thread = NULL;
+        /* axutil_thread_t *worker_thread = NULL; FIXME: unused */
 
         socket = (int)axutil_network_handler_svr_socket_accept(env,
                                                           svr_thread->



---------------------------------------------------------------------
To unsubscribe, e-mail: c-dev-unsubscribe@axis.apache.org
For additional commands, e-mail: c-dev-help@axis.apache.org

[prev in list] [next in list] [prev in thread] [next in thread]