Author: samisa
Date: Mon Nov 7 00:50:25 2005
New Revision: 331240
URL: http://svn.apache.org/viewcvs?rev=331240&view=rev
Log:
Fixed compilation problems due to param related typedefs
Modified:
webservices/axis2/trunk/c/configure
webservices/axis2/trunk/c/include/axis2_handler_desc.h
webservices/axis2/trunk/c/include/axis2_param.h
webservices/axis2/trunk/c/include/axis2_param_container.h
webservices/axis2/trunk/c/modules/core/description/src/Makefile.in
webservices/axis2/trunk/c/modules/core/handlers/src/Makefile.in
webservices/axis2/trunk/c/modules/test/Makefile.in
Modified: webservices/axis2/trunk/c/configure
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/configure?rev=331240&r1=331239&r2=331240&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure (original)
+++ webservices/axis2/trunk/c/configure Mon Nov 7 00:50:25 2005
@@ -22948,7 +22948,7 @@
fi
-
ac_config_files="$ac_config_files Makefile
modules/Makefile modules/core/Makefile modules/core/context/Makefile
modules/core/context/src/Makefile modules/core/description/Makefile
modules/core/description/src/Makefile modules/core/description/test/Makefile
modules/core/engine/Makefile modules/core/engine/src/Makefile
modules/core/handlers/Makefile modules/core/handlers/src/Makefile
modules/xml/Makefile modules/xml/guththila/Makefile
modules/xml/guththila/src/Makefile modules/xml/soap/Makefile
modules/xml/soap/src/Makefile modules/xml/om/Makefile
modules/xml/om/src/Makefile modules/xml/om/test/Makefile
modules/common/Makefile modules/common/src/Makefile
modules/common/test/Makefile modules/util/Makefile modules/util/src/Makefile
modules/util/test/Makefile modules/wsdl/Makefile modules/wsdl/src/Makefile
modules/wsdl/test/Makefile modules/test/Makefile modules/test/om/Makefile
modules/test/om/src/Makefile modules/test/common/Makefile
modules/test/util/Makefile modules/test/unit/Makefile"
+
ac_config_files="$ac_config_files Makefile modules/Makefile
modules/core/Makefile modules/core/context/Makefile
modules/core/context/src/Makefile modules/core/description/Makefile
modules/core/description/src/Makefile modules/core/description/test/Makefile
modules/core/engine/Makefile modules/core/engine/src/Makefile
modules/core/handlers/Makefile modules/core/handlers/src/Makefile
modules/xml/Makefile modules/xml/guththila/Makefile
modules/xml/guththila/src/Makefile modules/xml/soap/Makefile
modules/xml/soap/src/Makefile modules/xml/om/Makefile
modules/xml/om/src/Makefile modules/xml/om/test/Makefile
modules/common/Makefile modules/common/src/Makefile
modules/common/test/Makefile modules/util/Makefile modules/util/src/Makefile
modules/util/test/Makefile modules/wsdl/Makefile modules/wsdl/src/Makefile
modules/wsdl/test/Makefile modules/test/Makefile modules/test/om/Makefile
modules/test/om/src/Makefile modules/test/common/Makefile
modules/test/core/Makefile modules/test/core/handlers/Makefile
modules/test/util/Makefile modules/test/unit/Makefile"
cat >confcache <<\_ACEOF
@@ -23582,6 +23582,8 @@
"modules/test/om/Makefile" ) CONFIG_FILES="$CONFIG_FILES
modules/test/om/Makefile" ;;
"modules/test/om/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES
modules/test/om/src/Makefile" ;;
"modules/test/common/Makefile" ) CONFIG_FILES="$CONFIG_FILES
modules/test/common/Makefile" ;;
+ "modules/test/core/Makefile" ) CONFIG_FILES="$CONFIG_FILES
modules/test/core/Makefile" ;;
+ "modules/test/core/handlers/Makefile" ) CONFIG_FILES="$CONFIG_FILES
modules/test/core/handlers/Makefile" ;;
"modules/test/util/Makefile" ) CONFIG_FILES="$CONFIG_FILES
modules/test/util/Makefile" ;;
"modules/test/unit/Makefile" ) CONFIG_FILES="$CONFIG_FILES
modules/test/unit/Makefile" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
Modified: webservices/axis2/trunk/c/include/axis2_handler_desc.h
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_handler_desc.h?rev=331240&r1=331239&r2=331240&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_handler_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_handler_desc.h Mon Nov 7 00:50:25
2005
@@ -25,6 +25,7 @@
#include <axis2_defines.h>
#include <axis2_qname.h>
#include <axis2_param.h>
+#include <axis2_param_container.h>
#include <axis2_phase_rule.h>
#include <axis2_handler.h>
Modified: webservices/axis2/trunk/c/include/axis2_param.h
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_param.h?rev=331240&r1=331239&r2=331240&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_param.h (original)
+++ webservices/axis2/trunk/c/include/axis2_param.h Mon Nov 7 00:50:25 2005
@@ -32,6 +32,9 @@
{
#endif
+struct axis2_param;
+struct axis2_param_ops;
+
/**
* @defgroup axis2_param Handlers
* @ingroup axis2_core_description
@@ -52,28 +55,28 @@
/**
* \brief param operations struct
*/
-AXIS2_DECLARE_DATA struct axis2_param_ops_s
+AXIS2_DECLARE_DATA typedef struct axis2_param_ops
{
/**
* Parameter name accessor
* @return name of the param
*/
- axis2_char_t* (AXIS2_CALL *get_name)(axis2_param_t *param,
+ axis2_char_t* (AXIS2_CALL *get_name)(struct axis2_param *param,
axis2_env_t **env);
/**
* Parameter value accessor
* @return Object
*/
- void* (AXIS2_CALL *get_value)(axis2_param_t *param,
+ void* (AXIS2_CALL *get_value)(struct axis2_param *param,
axis2_env_t **env);
/**
* param name mutator
* @param name
*/
- axis2_status_t (AXIS2_CALL *set_name)(axis2_param_t *param,
+ axis2_status_t (AXIS2_CALL *set_name)(struct axis2_param *param,
axis2_env_t **env,
axis2_char_t *name);
@@ -82,7 +85,7 @@
*
* @param value
*/
- axis2_status_t (AXIS2_CALL *set_value)(axis2_param_t *param,
+ axis2_status_t (AXIS2_CALL *set_value)(struct axis2_param *param,
axis2_env_t **env,
void *value);
@@ -91,7 +94,7 @@
*
* @return boolean
*/
- axis2_bool_t (AXIS2_CALL *is_locked)(axis2_param_t *param,
+ axis2_bool_t (AXIS2_CALL *is_locked)(struct axis2_param *param,
axis2_env_t **env);
/**
@@ -99,7 +102,7 @@
*
* @param value
*/
- axis2_status_t (AXIS2_CALL *set_locked)(axis2_param_t *param,
+ axis2_status_t (AXIS2_CALL *set_locked)(struct axis2_param *param,
axis2_env_t **env,
axis2_bool_t value);
@@ -108,10 +111,10 @@
*
* @return int
*/
- int (AXIS2_CALL *get_param_type)(axis2_param_t *param,
+ int (AXIS2_CALL *get_param_type)(struct axis2_param *param,
axis2_env_t **env);
- axis2_status_t (AXIS2_CALL *set_param_type)(axis2_param_t *param,
+ axis2_status_t (AXIS2_CALL *set_param_type)(struct axis2_param *param,
axis2_env_t **env,
int type);
@@ -125,7 +128,7 @@
* @param element <code>OMElement<code>
*/
- axis2_status_t (AXIS2_CALL *set_param_element)(axis2_param_t *param,
+ axis2_status_t (AXIS2_CALL *set_param_element)(struct axis2_param *param,
axis2_env_t **env,
axis2_om_node_t *element);
@@ -134,21 +137,21 @@
* @return <code>OMElement<code>
*/
axis2_om_node_t* (AXIS2_CALL *get_param_element)
-
(axis2_param_t *param,
+
(struct axis2_param *param,
axis2_env_t **env);
- axis2_status_t (AXIS2_CALL *free)(axis2_param_t *param,
+ axis2_status_t (AXIS2_CALL *free)(struct axis2_param *param,
axis2_env_t **env);
-};
+}axis2_param_ops_t;
/**
* \brief Parameter struct
*/
-struct axis2_param_s
+typedef struct axis2_param
{
/** Parameter related operations */
axis2_param_ops_t *ops;
-};
+}axis2_param_t;
/**
* creates param struct
Modified: webservices/axis2/trunk/c/include/axis2_param_container.h
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_param_container.h?rev=331240&r1=331239&r2=331240&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_param_container.h (original)
+++ webservices/axis2/trunk/c/include/axis2_param_container.h Mon Nov 7
00:50:25 2005
@@ -39,6 +39,9 @@
{
#endif
+struct axis2_param_container;
+struct axis2_param_container_ops;
+
/** @defgroup axis2_param_container Parameter Container
* @ingroup axis2_description
* @{
@@ -49,12 +52,12 @@
* @brief Param Container operations struct
* Encapsulator struct for operations of axis2_param_container
*/
-AXIS2_DECLARE_DATA struct axis2_param_container_ops_s
+AXIS2_DECLARE_DATA typedef struct axis2_param_container_ops
{
/** De-allocate memory
* @return status code
*/
- axis2_status_t (AXIS2_CALL *free)(axis2_param_container_t
*param_container,
+ axis2_status_t (AXIS2_CALL *free)(struct axis2_param_container
*param_container,
axis2_env_t **env);
/** Add a param
@@ -62,7 +65,7 @@
* @return status code
*/
axis2_status_t (AXIS2_CALL *add_param)
-
(axis2_param_container_t *param_container,
+ (struct
axis2_param_container *param_container,
axis2_env_t **env,
axis2_param_t *param);
@@ -71,7 +74,7 @@
* @return param
*/
axis2_param_t *(AXIS2_CALL *get_param)
-
(axis2_param_container_t *param_container,
+ (struct
axis2_param_container *param_container,
axis2_env_t **env,
const axis2_char_t *name);
@@ -80,7 +83,7 @@
* @return all the params contained
*/
axis2_hash_t *(AXIS2_CALL *get_params)
-
(axis2_param_container_t *param_container,
+ (struct
axis2_param_container *param_container,
axis2_env_t **env);
/** To check whether the paramter is locked at any level
@@ -88,27 +91,26 @@
* @return whether param is locked
*/
axis2_bool_t (AXIS2_CALL *is_param_locked)
-
(axis2_param_container_t *param_container,
+ (struct
axis2_param_container *param_container,
axis2_env_t **env,
const axis2_char_t *param_name) ;
-};
+}axis2_param_container_ops_t;
/**
* @brief Param container struct
* Container for params
*/
-AXIS2_DECLARE_DATA struct axis2_param_container_s
+AXIS2_DECLARE_DATA typedef struct axis2_param_container
{
axis2_param_container_ops_t *ops;
-};
+}axis2_param_container_t;
/**
* Creates param container struct
* @return pointer to newly created param container
*/
-AXIS2_DECLARE(axis2_param_container_t *)
-axis2_param_container_create (axis2_env_t **env);
+AXIS2_DECLARE(axis2_param_container_t *) axis2_param_container_create
(axis2_env_t **env);
/*************************** Function macros
**********************************/
Modified: webservices/axis2/trunk/c/modules/core/description/src/Makefile.in
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/Makefile.in?rev=331240&r1=331239&r2=331240&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/Makefile.in
(original)
+++ webservices/axis2/trunk/c/modules/core/description/src/Makefile.in Mon Nov
7 00:50:25 2005
@@ -64,7 +64,8 @@
am__DEPENDENCIES_1 =
libaxis2_description_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libaxis2_description_la_OBJECTS = param_container.lo operation.lo \
- svc.lo module.lo param.lo svc_grp.lo phase_rule.lo
+ svc.lo module.lo param.lo svc_grp.lo phase_rule.lo \
+ handler_desc.lo
libaxis2_description_la_OBJECTS = \
$(am_libaxis2_description_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -199,7 +200,8 @@
module.c \
param.c \
svc_grp.c \
- phase_rule.c
+ phase_rule.c \
+ handler_desc.c
libaxis2_description_la_LIBADD = $(LDFLAGS)
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
@@ -275,6 +277,7 @@
distclean-compile:
-rm -f *.tab.c
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
Modified: webservices/axis2/trunk/c/modules/core/handlers/src/Makefile.in
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/handlers/src/Makefile.in?rev=331240&r1=331239&r2=331240&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/handlers/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/core/handlers/src/Makefile.in Mon Nov 7
00:50:25 2005
@@ -63,7 +63,7 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libaxis2_handlers_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libaxis2_handlers_la_OBJECTS = axis2_handler.lo
+am_libaxis2_handlers_la_OBJECTS = handler.lo
libaxis2_handlers_la_OBJECTS = $(am_libaxis2_handlers_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
@@ -191,7 +191,7 @@
target_vendor = @target_vendor@
lib_LTLIBRARIES = libaxis2_handlers.la
AM_CPPFLAGS = $(CPPFLAGS)
-libaxis2_handlers_la_SOURCES = axis2_handler.c
+libaxis2_handlers_la_SOURCES = handler.c
libaxis2_handlers_la_LIBADD = $(LDFLAGS)
INCLUDES = -I${CUTEST_HOME}/include \
-I$(top_builddir)/include \
@@ -266,7 +266,7 @@
distclean-compile:
-rm -f *.tab.c
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c
-o $@ $<; \
Modified: webservices/axis2/trunk/c/modules/test/Makefile.in
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/Makefile.in?rev=331240&r1=331239&r2=331240&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/test/Makefile.in Mon Nov 7 00:50:25 2005
@@ -169,7 +169,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-SUBDIRS = util common om unit
+SUBDIRS = util common om unit core
all: all-recursive
.SUFFIXES:
