axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r410712 [4/8] - in /webservices/axis2/trunk/c: axiom/include/ axiom/src/attachments/ axiom/src/om/ axiom/src/parser/guththila/ axiom/src/parser/libxml2/ axiom/src/soap/ include/ modules/core/addr/ modules/core/clientapi/ modules/core/contex...
Date Thu, 01 Jun 2006 01:37:15 GMT
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c Wed May 31 18:36:55 2006
@@ -38,7 +38,7 @@
 
 /***************************** Function headers *******************************/
 
-AXIS2_DECLARE(axis2_status_t)
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_http_transport_utils_process_http_post_request
                         (const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx, 
                         axis2_stream_t *in_stream, axis2_stream_t *out_stream,
@@ -46,7 +46,7 @@
                         axis2_char_t *soap_action_header,
                         axis2_char_t *request_uri);
     
-AXIS2_DECLARE(axis2_bool_t) 
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
 axis2_http_transport_utils_process_http_get_request
                         (const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx,
                         axis2_stream_t *in_stream, axis2_stream_t *out_stream,
@@ -55,58 +55,58 @@
                         axis2_char_t *request_uri, axis2_conf_ctx_t *conf_ctx, 
                         axis2_hash_t *request_params);
     
-AXIS2_DECLARE(axis2_soap_envelope_t*)
+AXIS2_EXTERN axis2_soap_envelope_t* AXIS2_CALL
 axis2_http_transport_utils_create_envelope_from_get_request
                         (const axis2_env_t *env, axis2_char_t *request_uri,
                         axis2_hash_t *request_params);
     
-AXIS2_DECLARE(axis2_om_stax_builder_t* )
+AXIS2_EXTERN axis2_om_stax_builder_t*  AXIS2_CALL
 axis2_http_transport_utils_select_builder_for_mime
                         (const axis2_env_t *env, axis2_char_t *request_uri,
                         axis2_msg_ctx_t *msg_ctx, axis2_stream_t *in_stream,
                         axis2_char_t *content_type);
     
-AXIS2_DECLARE(axis2_bool_t ) 
+AXIS2_EXTERN axis2_bool_t  AXIS2_CALL 
 axis2_http_transport_utils_is_optimized(const axis2_env_t *env, 
                                         axis2_om_element_t *om_element);
                                                 
-AXIS2_DECLARE(axis2_bool_t ) 
+AXIS2_EXTERN axis2_bool_t  AXIS2_CALL 
 axis2_http_transport_utils_do_write_mtom(const axis2_env_t *env, 
                                         axis2_msg_ctx_t *msg_ctx);
                                                 
-AXIS2_DECLARE(axis2_bool_t ) 
+AXIS2_EXTERN axis2_bool_t  AXIS2_CALL 
 axis2_http_transport_utils_is_doing_rest(const axis2_env_t *env, 
                                         axis2_msg_ctx_t *msg_ctx);
                                                 
-AXIS2_DECLARE(axis2_bool_t) 
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
 axis2_http_transport_utils_is_doing_rest_through_post
                         (const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx);
 						
-AXIS2_DECLARE(axis2_status_t)
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_http_transport_utils_strdecode(const axis2_env_t *env, axis2_char_t *dest, 
 						axis2_char_t *src);
 						
-AXIS2_DECLARE(int)
+AXIS2_EXTERN int AXIS2_CALL
 axis2_http_transport_utils_hexit(axis2_char_t c);
 
-AXIS2_DECLARE(axis2_char_t* )
+AXIS2_EXTERN axis2_char_t*  AXIS2_CALL
 axis2_http_transport_utils_get_services_html(const axis2_env_t *env, 
 							axis2_conf_ctx_t *conf_ctx);
-AXIS2_DECLARE(axis2_char_t*)
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 axis2_http_transport_utils_get_charset_enc(const axis2_env_t *env, 
 						axis2_char_t *content_type);
 int AXIS2_CALL
 axis2_http_transport_utils_on_data_request(char *buffer, int size, void *ctx);
 
-AXIS2_DECLARE(axis2_soap_envelope_t*)
+AXIS2_EXTERN axis2_soap_envelope_t* AXIS2_CALL
 axis2_http_transport_utils_create_soap_msg(const axis2_env_t *env, 
                         axis2_msg_ctx_t *msg_ctx, axis2_char_t *soap_ns_uri);
-AXIS2_DECLARE(axis2_char_t*)
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 axis2_http_transport_utils_get_value_from_content_type(const axis2_env_t *env, 
 						axis2_char_t *content_type, axis2_char_t *key);
 /***************************** End of function headers ************************/
 
-AXIS2_DECLARE(axis2_status_t ) 
+AXIS2_EXTERN axis2_status_t  AXIS2_CALL 
 axis2_http_transport_utils_process_http_post_request
                         (const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx, 
                         axis2_stream_t *in_stream, axis2_stream_t *out_stream,
@@ -409,7 +409,7 @@
 }
 
 
-AXIS2_DECLARE(axis2_bool_t) 
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
 axis2_http_transport_utils_process_http_get_request
                         (const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx,
                         axis2_stream_t *in_stream, axis2_stream_t *out_stream,
@@ -474,7 +474,7 @@
 }
 
 
-AXIS2_DECLARE(axis2_soap_envelope_t*)
+AXIS2_EXTERN axis2_soap_envelope_t* AXIS2_CALL
 axis2_http_transport_utils_create_envelope_from_get_request
                         (const axis2_env_t *env, axis2_char_t *request_uri,
                         axis2_hash_t *request_params)
@@ -539,7 +539,7 @@
 }
 
 
-AXIS2_DECLARE(axis2_om_stax_builder_t* )
+AXIS2_EXTERN axis2_om_stax_builder_t*  AXIS2_CALL
 axis2_http_transport_utils_select_builder_for_mime
                         (const axis2_env_t *env, axis2_char_t *request_uri,
                         axis2_msg_ctx_t *msg_ctx, axis2_stream_t *in_stream,
@@ -552,7 +552,7 @@
 }
 
 
-AXIS2_DECLARE(axis2_bool_t ) 
+AXIS2_EXTERN axis2_bool_t  AXIS2_CALL 
 axis2_http_transport_utils_is_optimized(const axis2_env_t *env, 
                                         axis2_om_element_t *om_element)
 {
@@ -563,7 +563,7 @@
 }
 
 
-AXIS2_DECLARE(axis2_bool_t) 
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
 axis2_http_transport_utils_do_write_mtom(const axis2_env_t *env, 
                                         axis2_msg_ctx_t *msg_ctx)
 {
@@ -586,7 +586,7 @@
 }
 
 
-AXIS2_DECLARE(axis2_bool_t) 
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
 axis2_http_transport_utils_is_doing_rest(const axis2_env_t *env, 
                                         axis2_msg_ctx_t *msg_ctx)
 {
@@ -597,7 +597,7 @@
 }
 
 
-AXIS2_DECLARE(axis2_bool_t) 
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
 axis2_http_transport_utils_is_doing_rest_through_post
                         (const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx)
 {
@@ -607,7 +607,7 @@
     return AXIS2_FALSE;
 }
 
-AXIS2_DECLARE(axis2_hash_t *)
+AXIS2_EXTERN axis2_hash_t * AXIS2_CALL
 axis2_http_transport_utils_get_request_params(const axis2_env_t *env, 
 						axis2_char_t *request_uri)
 {
@@ -670,7 +670,7 @@
 }
 
 
-AXIS2_DECLARE(axis2_status_t)
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_http_transport_utils_strdecode(const axis2_env_t *env, axis2_char_t *dest, 
 						axis2_char_t *src)
 {
@@ -697,7 +697,7 @@
 }
 
 
-AXIS2_DECLARE(int )
+AXIS2_EXTERN int  AXIS2_CALL
 axis2_http_transport_utils_hexit(axis2_char_t c)
 {
 	if ( c >= '0' && c <= '9' )
@@ -715,7 +715,7 @@
 	return 0;           /* shouldn't happen, we're guarded by isxdigit() */
 }
 
-AXIS2_DECLARE(axis2_char_t*)
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 axis2_http_transport_utils_get_services_html(const axis2_env_t *env, 
 							axis2_conf_ctx_t *conf_ctx)
 {
@@ -834,7 +834,7 @@
 	return ret;
 }
 
-AXIS2_DECLARE(axis2_char_t*)
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 axis2_http_transport_utils_get_charset_enc(const axis2_env_t *env, 
 						axis2_char_t *content_type)
 {
@@ -953,7 +953,7 @@
 	return 0;	
 }
 
-AXIS2_DECLARE(axis2_soap_envelope_t*)
+AXIS2_EXTERN axis2_soap_envelope_t* AXIS2_CALL
 axis2_http_transport_utils_create_soap_msg(const axis2_env_t *env, 
                         axis2_msg_ctx_t *msg_ctx, axis2_char_t *soap_ns_uri)
 {
@@ -1131,7 +1131,7 @@
 }
 
 
-AXIS2_DECLARE(axis2_char_t*)
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 axis2_http_transport_utils_get_value_from_content_type(const axis2_env_t *env, 
 						axis2_char_t *content_type, axis2_char_t *key)
 {

Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c Wed May 31 18:36:55 2006
@@ -82,7 +82,7 @@
 								
 /***************************** End of function headers ************************/
 
-AXIS2_DECLARE(axis2_http_worker_t *)
+AXIS2_EXTERN axis2_http_worker_t * AXIS2_CALL
 axis2_http_worker_create (const axis2_env_t *env, axis2_conf_ctx_t *conf_ctx)
 {
     axis2_http_worker_impl_t *http_worker_impl = NULL;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c Wed May 31 18:36:55 2006
@@ -69,7 +69,7 @@
 
 /***************************** End of function headers ************************/
 
-AXIS2_DECLARE(axis2_transport_receiver_t *) 
+AXIS2_EXTERN axis2_transport_receiver_t * AXIS2_CALL 
 axis2_http_server_create (const axis2_env_t *env, axis2_char_t *repo, int port)
 {
     axis2_http_server_impl_t *server_impl = NULL;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c Wed May 31 18:36:55 2006
@@ -74,7 +74,7 @@
 axis2_status_t AXIS2_CALL 
 axis2_http_svr_thread_free (axis2_http_svr_thread_t *svr_thread, 
 						const axis2_env_t *env);
-AXIS2_DECLARE (const axis2_env_t*)
+AXIS2_EXTERN const axis2_env_t* AXIS2_CALL
 init_thread_env(const axis2_env_t **system_env);
 
 void * AXIS2_THREAD_FUNC

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c Wed May 31 18:36:55 2006
@@ -97,7 +97,7 @@
 
 /***************************** End of function headers ************************/
 
-AXIS2_DECLARE(axis2_http_client_t *) 
+AXIS2_EXTERN axis2_http_client_t * AXIS2_CALL 
 axis2_http_client_create (const axis2_env_t *env, axis2_url_t *url)
 {
     axis2_http_client_impl_t *http_client_impl = NULL;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c Wed May 31 18:36:55 2006
@@ -84,7 +84,7 @@
 						const axis2_env_t *env);
 /***************************** End of function headers ************************/
 
-AXIS2_DECLARE(axis2_rest_sender_t *) 
+AXIS2_EXTERN axis2_rest_sender_t * AXIS2_CALL 
 axis2_rest_sender_create(const axis2_env_t *env)
 {
     axis2_rest_sender_impl_t *sender_impl = NULL;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c Wed May 31 18:36:55 2006
@@ -56,7 +56,7 @@
 axis2_ssl_stream_get_char(axis2_stream_t *stream, const axis2_env_t *env);
 
 
-AXIS2_DECLARE(axis2_stream_t *)
+AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
 axis2_stream_create_ssl(const axis2_env_t *env, axis2_socket_t socket)
 {
     ssl_stream_impl_t *stream_impl = NULL;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.h Wed May 31 18:36:55 2006
@@ -33,7 +33,7 @@
 /** \brief Constructor for creating ssl stream
   * @return axis2_stream (ssl)
   */
-AXIS2_DECLARE(axis2_stream_t *) 
+AXIS2_EXTERN axis2_stream_t * AXIS2_CALL 
 axis2_stream_create_ssl(const axis2_env_t *env, axis2_socket_t socket);
 
 /** @} */

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c Wed May 31 18:36:55 2006
@@ -57,7 +57,7 @@
 /*
  * Internal function. Not exposed to outside
  */
-AXIS2_DECLARE(axis2_stream_t *)
+AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
 axis2_stream_create_apache2(const axis2_env_t *env, request_rec *request)
 {
     apache2_stream_impl_t *stream_impl = NULL;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.h Wed May 31 18:36:55 2006
@@ -32,7 +32,7 @@
 /** \brief Constructor for creating apche2 stream
   * @return axis2_stream (apache2)
   */
-AXIS2_DECLARE(axis2_stream_t *) axis2_stream_create_apache2
+AXIS2_EXTERN axis2_stream_t * AXIS2_CALL axis2_stream_create_apache2
                         (const axis2_env_t *env, request_rec *req);
 
 /** @} */

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c Wed May 31 18:36:55 2006
@@ -53,7 +53,7 @@
 axis2_apache2_worker_process_request(axis2_apache2_worker_t *apache2_worker, 
 							const axis2_env_t *env, request_rec *req);
     
-AXIS2_DECLARE(axis2_char_t*)
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 axis2_apache2_worker_get_bytes(const axis2_env_t *env, 
                         axis2_stream_t *stream);
                         
@@ -63,7 +63,7 @@
 								
 /***************************** End of function headers ************************/
 
-AXIS2_DECLARE(axis2_apache2_worker_t *)
+AXIS2_EXTERN axis2_apache2_worker_t * AXIS2_CALL
 axis2_apache2_worker_create (const axis2_env_t *env, axis2_char_t *repo_path)
 {
     axis2_apache2_worker_impl_t *apache2_worker_impl = NULL;
@@ -333,7 +333,7 @@
 	return send_status;
 }
 
-AXIS2_DECLARE(axis2_char_t*)
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 axis2_apache2_worker_get_bytes(const axis2_env_t *env, 
                         axis2_stream_t *stream)
 {

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/axis2_apache2_out_transport_info.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/axis2_apache2_out_transport_info.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/axis2_apache2_out_transport_info.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/axis2_apache2_out_transport_info.h Wed May 31 18:36:55 2006
@@ -34,7 +34,7 @@
   * @{
   */
 
-AXIS2_DECLARE(axis2_http_out_transport_info_t *) 
+AXIS2_EXTERN axis2_http_out_transport_info_t * AXIS2_CALL 
 axis2_apache2_out_transport_info_create(const axis2_env_t *env,
 					request_rec *r);
 
@@ -43,7 +43,7 @@
  * cast into appropriate type and then pass the cast object
  * into the http_out_transport_info structure's free method
  */
-AXIS2_DECLARE(axis2_status_t) 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_apache2_out_transport_info_free_void_arg (void *transport_info,
                                              const axis2_env_t *env);
 

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/axis2_apache2_worker.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/axis2_apache2_worker.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/axis2_apache2_worker.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/axis2_apache2_worker.h Wed May 31 18:36:55 2006
@@ -68,7 +68,7 @@
 };
 
 
-AXIS2_DECLARE(axis2_apache2_worker_t *) 
+AXIS2_EXTERN axis2_apache2_worker_t * AXIS2_CALL 
 axis2_apache2_worker_create (const axis2_env_t *env, axis2_char_t *repo_path);
     
 /************************** Start of function macros **************************/

Modified: webservices/axis2/trunk/c/modules/core/util/axis2_core_utils.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/util/axis2_core_utils.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/util/axis2_core_utils.h (original)
+++ webservices/axis2/trunk/c/modules/core/util/axis2_core_utils.h Wed May 31 18:36:55 2006
@@ -35,31 +35,31 @@
  * @ingroup axis2_core_utils
  * @{
  */
-    AXIS2_DECLARE(axis2_msg_ctx_t *)
+    AXIS2_EXTERN axis2_msg_ctx_t * AXIS2_CALL
     axis2_core_utils_create_out_msg_ctx(const axis2_env_t *env,
                                 axis2_msg_ctx_t *in_msg_ctx);
 
-    AXIS2_DECLARE(void)
+    AXIS2_EXTERN void AXIS2_CALL
     axis2_core_utils_reset_out_msg_ctx(const axis2_env_t *env,
                                     axis2_msg_ctx_t *out_msg_ctx);
                                     
-    AXIS2_DECLARE(axis2_qname_t*)
+    AXIS2_EXTERN axis2_qname_t* AXIS2_CALL
     axis2_core_utils_get_module_qname(const axis2_env_t *env, axis2_char_t *name, 
                                     axis2_char_t *version);
                                     
-    AXIS2_DECLARE(axis2_status_t)
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_core_utils_calculate_default_module_version(const axis2_env_t *env, 
                         axis2_hash_t *modules_map, struct axis2_conf *axis_conf);
     
-    AXIS2_DECLARE(axis2_char_t *)
+    AXIS2_EXTERN axis2_char_t * AXIS2_CALL
     axis2_core_utils_get_module_name(const axis2_env_t *env, 
                                     axis2_char_t *module_name);
                                     
-    AXIS2_DECLARE(axis2_char_t *)
+    AXIS2_EXTERN axis2_char_t * AXIS2_CALL
     axis2_core_utils_get_module_version(const axis2_env_t *env, 
                                         axis2_char_t *module_name);
                                         
-    AXIS2_DECLARE(axis2_bool_t)
+    AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axis2_core_utils_is_latest_mod_ver(const axis2_env_t *env, 
                                         axis2_char_t *module_ver, 
                                         axis2_char_t *current_def_ver);

Modified: webservices/axis2/trunk/c/modules/core/util/core_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/util/core_utils.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/util/core_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/util/core_utils.c Wed May 31 18:36:55 2006
@@ -23,7 +23,7 @@
 #include <axis2_uuid_gen.h>
 #include <axis2_property.h>
 
-AXIS2_DECLARE(axis2_msg_ctx_t *)
+AXIS2_EXTERN axis2_msg_ctx_t * AXIS2_CALL
 axis2_core_utils_create_out_msg_ctx(const axis2_env_t *env,
                                 axis2_msg_ctx_t *in_msg_ctx)
 {
@@ -165,7 +165,7 @@
     return new_msg_ctx;
 }
 
-AXIS2_DECLARE(void)
+AXIS2_EXTERN void AXIS2_CALL
 axis2_core_utils_reset_out_msg_ctx(const axis2_env_t *env,
                                 axis2_msg_ctx_t *out_msg_ctx)
 {
@@ -196,7 +196,7 @@
     return;
 }
 
-AXIS2_DECLARE(axis2_qname_t*)
+AXIS2_EXTERN axis2_qname_t* AXIS2_CALL
 axis2_core_utils_get_module_qname(const axis2_env_t *env, axis2_char_t *name, 
                                 axis2_char_t *version)
 {
@@ -229,7 +229,7 @@
     return ret_qname;    
 }
 
-AXIS2_DECLARE(axis2_status_t)
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_core_utils_calculate_default_module_version(const axis2_env_t *env, 
                         axis2_hash_t *modules_map, axis2_conf_t *axis_conf) 
 {
@@ -330,7 +330,7 @@
     return AXIS2_SUCCESS;
 }
     
-AXIS2_DECLARE(axis2_char_t *)
+AXIS2_EXTERN axis2_char_t * AXIS2_CALL
 axis2_core_utils_get_module_name(const axis2_env_t *env, axis2_char_t *module_name)
 {
     axis2_char_t version_seperator = '-';
@@ -353,7 +353,7 @@
     return name;
 }
 
-AXIS2_DECLARE(axis2_char_t *)
+AXIS2_EXTERN axis2_char_t * AXIS2_CALL
 axis2_core_utils_get_module_version(const axis2_env_t *env, axis2_char_t *module_name)
 {
     axis2_char_t version_seperator = '-';
@@ -370,7 +370,7 @@
     return NULL;
 }
 
-AXIS2_DECLARE(axis2_bool_t)
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axis2_core_utils_is_latest_mod_ver(const axis2_env_t *env, 
                         axis2_char_t *module_ver, axis2_char_t *current_def_ver)
 {

Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c Wed May 31 18:36:55 2006
@@ -88,7 +88,7 @@
 
 /******************************************************************************/                         
 
-AXIS2_DECLARE(axis2_handler_t*)
+AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
 axis2_addr_in_handler_create(const axis2_env_t *env, 
                          axis2_qname_t *qname) 
 {

Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c Wed May 31 18:36:55 2006
@@ -60,7 +60,7 @@
                                                              axis2_char_t *addr_ns);
 
 
-AXIS2_DECLARE (axis2_handler_t *)
+AXIS2_EXTERN axis2_handler_t *AXIS2_CALL
 axis2_addr_out_handler_create (const axis2_env_t *env, axis2_qname_t * qname)
 {
     axis2_handler_t *handler = NULL;

Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_msg_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_msg_ref.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_msg_ref.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_msg_ref.c Wed May 31 18:36:55 2006
@@ -78,7 +78,7 @@
 
 /************************** End of function prototypes ************************/
 
-AXIS2_DECLARE(axis2_wsdl_msg_ref_t *)
+AXIS2_EXTERN axis2_wsdl_msg_ref_t * AXIS2_CALL
 axis2_wsdl_msg_ref_create (const axis2_env_t *env)
 {
     axis2_wsdl_msg_ref_impl_t *msg_ref_impl = NULL;

Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_soap_op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_soap_op.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_soap_op.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_soap_op.c Wed May 31 18:36:55 2006
@@ -58,7 +58,7 @@
                         
 /************************** End of function prototypes ************************/
 
-AXIS2_DECLARE(axis2_wsdl_soap_op_t *)
+AXIS2_EXTERN axis2_wsdl_soap_op_t * AXIS2_CALL
 axis2_wsdl_soap_op_create (const axis2_env_t *env)
 {
     axis2_wsdl_soap_op_impl_t *soap_op_impl = NULL;

Modified: webservices/axis2/trunk/c/samples/server/math/math_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/math/math_skeleton.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/math/math_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/math/math_skeleton.c Wed May 31 18:36:55 2006
@@ -35,7 +35,7 @@
                         const axis2_env_t *env);
 
 
-AXIS2_DECLARE(axis2_svc_skeleton_t *)
+AXIS2_EXTERN axis2_svc_skeleton_t * AXIS2_CALL
 axis2_math_create(const axis2_env_t *env)
 {
     axis2_svc_skeleton_t *svc_skeleton = NULL;

Modified: webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c Wed May 31 18:36:55 2006
@@ -35,7 +35,7 @@
                         const axis2_env_t *env);
 
 
-AXIS2_DECLARE(axis2_svc_skeleton_t *)
+AXIS2_EXTERN axis2_svc_skeleton_t * AXIS2_CALL
 axis2_add_create(const axis2_env_t *env)
 {
     axis2_svc_skeleton_t *svc_skeleton = NULL;

Modified: webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c Wed May 31 18:36:55 2006
@@ -35,7 +35,7 @@
                         const axis2_env_t *env);
 
 
-AXIS2_DECLARE(axis2_svc_skeleton_t *)
+AXIS2_EXTERN axis2_svc_skeleton_t * AXIS2_CALL
 axis2_div_create(const axis2_env_t *env)
 {
     axis2_svc_skeleton_t *svc_skeleton = NULL;

Modified: webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c Wed May 31 18:36:55 2006
@@ -35,7 +35,7 @@
                         const axis2_env_t *env);
 
 
-AXIS2_DECLARE(axis2_svc_skeleton_t *)
+AXIS2_EXTERN axis2_svc_skeleton_t * AXIS2_CALL
 axis2_mul_create(const axis2_env_t *env)
 {
     axis2_svc_skeleton_t *svc_skeleton = NULL;

Modified: webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c Wed May 31 18:36:55 2006
@@ -35,7 +35,7 @@
                         const axis2_env_t *env);
 
 
-AXIS2_DECLARE(axis2_svc_skeleton_t *)
+AXIS2_EXTERN axis2_svc_skeleton_t * AXIS2_CALL
 axis2_sub_create(const axis2_env_t *env)
 {
     axis2_svc_skeleton_t *svc_skeleton = NULL;

Modified: webservices/axis2/trunk/c/util/include/axis2_allocator.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_allocator.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_allocator.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_allocator.h Wed May 31 18:36:55 2006
@@ -81,7 +81,7 @@
     * @param allocator user defined allcator. Optional, can be NULL. If NULL, a default allocator will be returned.
     * @return initialized allocator. NULL on error.
     */
-    AXIS2_DECLARE(axis2_allocator_t *) 
+    AXIS2_EXTERN axis2_allocator_t * AXIS2_CALL 
 	axis2_allocator_init (axis2_allocator_t *allocator);
 
   /** 
@@ -89,7 +89,7 @@
     * axis2_allocator_init() 
     * @param allocator 
     */
-    AXIS2_DECLARE(axis2_status_t) 
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 	axis2_allocator_free(axis2_allocator_t *allocator);
 
 #define AXIS2_MALLOC(allocator, size) \

Modified: webservices/axis2/trunk/c/util/include/axis2_array_list.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_array_list.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_array_list.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_array_list.h Wed May 31 18:36:55 2006
@@ -243,11 +243,11 @@
     * @param capacity initial capacity of this array_list
     */
 
-    AXIS2_DECLARE(axis2_array_list_t*) axis2_array_list_create(const axis2_env_t *env, int capacity);
+    AXIS2_EXTERN axis2_array_list_t* AXIS2_CALL axis2_array_list_create(const axis2_env_t *env, int capacity);
     /**
      * Free array passed as void pointer.
      */
-    AXIS2_DECLARE(axis2_status_t)
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_array_list_free_void_arg(
             void *array_list, 
             const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/util/include/axis2_base64.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_base64.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_base64.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_base64.h Wed May 31 18:36:55 2006
@@ -50,7 +50,7 @@
  * @param len the length of an unencrypted string.
  * @return the length of the string after it is encrypted
  */ 
-AXIS2_DECLARE(int) axis2_base64_encode_len(int len);
+AXIS2_EXTERN int AXIS2_CALL axis2_base64_encode_len(int len);
 
 /*
  * Encode a text string using base64encoding.
@@ -59,7 +59,7 @@
  * @param len_plain_src The length of the plain text string
  * @return the length of the encoded string
  */ 
-AXIS2_DECLARE(int) axis2_base64_encode(char * coded_dst, const char *plain_src, 
+AXIS2_EXTERN int AXIS2_CALL axis2_base64_encode(char * coded_dst, const char *plain_src, 
                                  int len_plain_src);
 
 /*
@@ -69,7 +69,7 @@
  * @param len_plain_src The length of the plain text string
  * @return the length of the encoded string
  */ 
-AXIS2_DECLARE(int) axis2_base64_encode_binary(char * coded_dst, 
+AXIS2_EXTERN int AXIS2_CALL axis2_base64_encode_binary(char * coded_dst, 
                                         const unsigned char *plain_src,
                                         int len_plain_src);
 
@@ -78,7 +78,7 @@
  * @param coded_src The encoded string
  * @return the length of the plain text string
  */ 
-AXIS2_DECLARE(int) axis2_base64_decode_len(const char * coded_src);
+AXIS2_EXTERN int AXIS2_CALL axis2_base64_decode_len(const char * coded_src);
 
 /*
  * Decode a string to plain text
@@ -86,7 +86,7 @@
  * @param coded_src The encoded string 
  * @return the length of the plain text string
  */ 
-AXIS2_DECLARE(int) axis2_base64_decode(char * plain_dst, const char *coded_src);
+AXIS2_EXTERN int AXIS2_CALL axis2_base64_decode(char * plain_dst, const char *coded_src);
 
 /*
  * Decode an EBCDIC string to plain text
@@ -94,7 +94,7 @@
  * @param coded_src The encoded string 
  * @return the length of the plain text string
  */ 
-AXIS2_DECLARE(int) axis2_base64_decode_binary(unsigned char * plain_dst, 
+AXIS2_EXTERN int AXIS2_CALL axis2_base64_decode_binary(unsigned char * plain_dst, 
                                         const char *coded_src);
 
 /* @} */

Modified: webservices/axis2/trunk/c/util/include/axis2_class_loader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_class_loader.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_class_loader.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_class_loader.h Wed May 31 18:36:55 2006
@@ -39,14 +39,14 @@
  * @{
  */
     
-AXIS2_DECLARE(axis2_status_t)
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_class_loader_init(const axis2_env_t *env);
 
-AXIS2_DECLARE(axis2_status_t)
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_class_loader_delete_dll (const axis2_env_t *env,
                                     axis2_dll_desc_t *dll_desc);
 
-AXIS2_DECLARE(void *)
+AXIS2_EXTERN void * AXIS2_CALL
 axis2_class_loader_create_dll (const axis2_env_t *env,
                                 axis2_param_t *impl_info_param);
     

Modified: webservices/axis2/trunk/c/util/include/axis2_dir_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_dir_handler.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_dir_handler.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_dir_handler.h Wed May 31 18:36:55 2006
@@ -40,7 +40,7 @@
      * @param pathname path to your service or module directory
      * @return array list of dll file names
      */
-    AXIS2_DECLARE(axis2_array_list_t *)
+    AXIS2_EXTERN axis2_array_list_t * AXIS2_CALL
     axis2_dir_handler_list_services_or_modules_in_dir(const axis2_env_t *env,
                                 axis2_char_t *pathname); 
     
@@ -50,7 +50,7 @@
      * @param pathname path  your modules or services folder
      * @return array list of contents of services or modules folder
      */
-    AXIS2_DECLARE(axis2_array_list_t *)
+    AXIS2_EXTERN axis2_array_list_t * AXIS2_CALL
     axis2_dir_handler_list_service_or_module_dirs(const axis2_env_t *env,
                                 axis2_char_t *pathname);
 

Modified: webservices/axis2/trunk/c/util/include/axis2_dll_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_dll_desc.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_dll_desc.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_dll_desc.h Wed May 31 18:36:55 2006
@@ -174,10 +174,10 @@
  * creates dll_desc struct
  * @param qname qname, can be NULL
  */
-AXIS2_DECLARE(axis2_dll_desc_t*) 
+AXIS2_EXTERN axis2_dll_desc_t* AXIS2_CALL 
 axis2_dll_desc_create(const axis2_env_t *env);
 
-AXIS2_DECLARE(axis2_status_t)
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_dll_desc_free_void_arg (void *dll_desc,
                                     const axis2_env_t *env);
 

Modified: webservices/axis2/trunk/c/util/include/axis2_env.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_env.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_env.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_env.h Wed May 31 18:36:55 2006
@@ -76,7 +76,7 @@
     * @param log_level log level to be used
     * @return pointer to the newly created environment struct 
     */
-    AXIS2_DECLARE(axis2_env_t *) axis2_env_create_all (axis2_char_t *log_file, 
+    AXIS2_EXTERN axis2_env_t * AXIS2_CALL axis2_env_create_all (axis2_char_t *log_file, 
         axis2_log_levels_t log_level);                                                   
 
 	/**
@@ -85,7 +85,7 @@
     * @param allocator pointer to an instance of allocator struct. Must be non-NULL    
     * @return pointer to the newly created environment struct 
     */
-    AXIS2_DECLARE(axis2_env_t *) axis2_env_create (axis2_allocator_t
+    AXIS2_EXTERN axis2_env_t * AXIS2_CALL axis2_env_create (axis2_allocator_t
                                                    *allocator);                                                   
 	
   /**
@@ -95,7 +95,7 @@
     * it would be taken as a flag for no logging.    
     * @return pointer to the newly created environment struct 
     */
-    AXIS2_DECLARE(axis2_env_t *) axis2_env_create_with_error 
+    AXIS2_EXTERN axis2_env_t * AXIS2_CALL axis2_env_create_with_error 
 													(axis2_allocator_t *allocator
                                                    , axis2_error_t *error);
 	
@@ -107,7 +107,7 @@
     * it would be taken as a flag for no logging.    
     * @return pointer to the newly created environment struct 
     */
-    AXIS2_DECLARE(axis2_env_t *) axis2_env_create_with_error_log 
+    AXIS2_EXTERN axis2_env_t * AXIS2_CALL axis2_env_create_with_error_log 
 													(axis2_allocator_t *allocator
                                                    , axis2_error_t *error
                                                    , axis2_log_t *log);
@@ -121,7 +121,7 @@
 	* @param pool pointer to an instance of thread_pool. May be NULL. If NULL
     * @return pointer to the newly created environment struct 
     */
-    AXIS2_DECLARE(axis2_env_t *) axis2_env_create_with_error_log_thread_pool 
+    AXIS2_EXTERN axis2_env_t * AXIS2_CALL axis2_env_create_with_error_log_thread_pool 
 													(axis2_allocator_t *allocator
                                                    , axis2_error_t *error
                                                    , axis2_log_t *log
@@ -135,7 +135,7 @@
     * @param string pointer to an instance of string struct. Optional, can be NULL. If NULL default string handler would be used.
     * @return pointer to the newly created environment struct 
     */
-    AXIS2_DECLARE(axis2_status_t) axis2_env_free (axis2_env_t *env);
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL axis2_env_free (axis2_env_t *env);
 
     /**
     * Frees the environment
@@ -148,21 +148,21 @@
     *       Eg : 0x3 frees both log and error
     * @return status of the operation
     */
-    AXIS2_DECLARE(axis2_status_t)  axis2_env_free_masked(axis2_env_t *env, char mask); 
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL  axis2_env_free_masked(axis2_env_t *env, char mask); 
     /**
      * Enables logging
      */
-    AXIS2_DECLARE(axis2_status_t) axis2_env_enable_log (axis2_env_t *env, axis2_bool_t enable);
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL axis2_env_enable_log (axis2_env_t *env, axis2_bool_t enable);
 
     /**
       * Checks the status code of environment
       */
-    AXIS2_DECLARE(axis2_status_t) axis2_env_check_status (const axis2_env_t *env);
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL axis2_env_check_status (const axis2_env_t *env);
     
     /**
       * Writes given message to the log
       */
-    AXIS2_DECLARE(axis2_status_t) axis2_env_write_log (const axis2_env_t *env, const char* message, axis2_log_levels_t level);
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL axis2_env_write_log (const axis2_env_t *env, const char* message, axis2_log_levels_t level);
     #define AXIS2_LOG(env, message, level) axis2_env_write_log (env,message, level)
 
 

Modified: webservices/axis2/trunk/c/util/include/axis2_error.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_error.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_error.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_error.h Wed May 31 18:36:55 2006
@@ -582,7 +582,8 @@
         int status_code;
     } axis2_error_t;
 
-AXIS2_DECLARE(axis2_status_t) axis2_error_init();
+AXIS2_EXTERN 
+axis2_status_t AXIS2_CALL axis2_error_init();
 
 #define AXIS2_ERROR_FREE(error) ((error->ops)->free(error))
 

Modified: webservices/axis2/trunk/c/util/include/axis2_error_default.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_error_default.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_error_default.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_error_default.h Wed May 31 18:36:55 2006
@@ -38,7 +38,7 @@
     * @param allocator allocator to be used. Mandatory, cannot be NULL    
     * @return pointer to the newly created error struct 
     */
-    AXIS2_DECLARE(axis2_error_t *) axis2_error_create (axis2_allocator_t * allocator);
+    AXIS2_EXTERN axis2_error_t *AXIS2_CALL axis2_error_create (axis2_allocator_t * allocator);
 
 
 /** @} */

Modified: webservices/axis2/trunk/c/util/include/axis2_file.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_file.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_file.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_file.h Wed May 31 18:36:55 2006
@@ -98,7 +98,7 @@
  * create new file
  * @return file newly created file
  */
-AXIS2_DECLARE(axis2_file_t *)
+AXIS2_EXTERN axis2_file_t * AXIS2_CALL
 axis2_file_create(const axis2_env_t *env);
 
 /*************************** Function macros **********************************/

Modified: webservices/axis2/trunk/c/util/include/axis2_file_diff.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_file_diff.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_file_diff.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_file_diff.h Wed May 31 18:36:55 2006
@@ -38,7 +38,7 @@
   * @param file name
   * @return status code
   */
-AXIS2_DECLARE(axis2_status_t) axis2_file_diff(const axis2_env_t *env
+AXIS2_EXTERN axis2_status_t AXIS2_CALL axis2_file_diff(const axis2_env_t *env
 		, axis2_char_t *expected_file_name, axis2_char_t *actual_file_name);
 
 #endif /* AXIS2_FILE_DIFF_H */

Modified: webservices/axis2/trunk/c/util/include/axis2_file_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_file_handler.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_file_handler.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_file_handler.h Wed May 31 18:36:55 2006
@@ -37,7 +37,7 @@
  * @param options file options given.
  * @return status code
  */ 
-AXIS2_DECLARE(void *) 
+AXIS2_EXTERN void * AXIS2_CALL 
 axis2_file_handler_open(const char *file_name, 
                         const char *options);
 
@@ -46,7 +46,7 @@
  * @param file_ptr file pointer of the file need to be closed
  * @return status code
  */
-AXIS2_DECLARE(axis2_status_t) 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_file_handler_close (void *file_ptr);
 
 /**
@@ -65,7 +65,7 @@
  *     file exists
  * @return status
  */
-AXIS2_DECLARE(axis2_status_t) 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_file_handler_access(axis2_char_t *path, 
                             int mode);
 

Modified: webservices/axis2/trunk/c/util/include/axis2_generic_obj.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_generic_obj.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_generic_obj.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_generic_obj.h Wed May 31 18:36:55 2006
@@ -76,7 +76,7 @@
  * create new generic_obj
  * @return generic_obj newly created generic_obj
  */
-AXIS2_DECLARE(axis2_generic_obj_t *)
+AXIS2_EXTERN axis2_generic_obj_t * AXIS2_CALL
 axis2_generic_obj_create(const axis2_env_t *env);
 
 /*************************** Function macros **********************************/

Modified: webservices/axis2/trunk/c/util/include/axis2_hash.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_hash.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_hash.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_hash.h Wed May 31 18:36:55 2006
@@ -76,7 +76,7 @@
  * @param env The environment to allocate the hash table out of
  * @return The hash table just created
   */
-  AXIS2_DECLARE(axis2_hash_t*) axis2_hash_make (const axis2_env_t *env);
+  AXIS2_EXTERN axis2_hash_t* AXIS2_CALL axis2_hash_make (const axis2_env_t *env);
 
 /**
  * Create a hash table with a custom hash function
@@ -84,7 +84,7 @@
  * @param hash_func A custom hash function.
  * @return The hash table just created
   */
-   AXIS2_DECLARE(axis2_hash_t*) axis2_hash_make_custom (const axis2_env_t *env
+   AXIS2_EXTERN axis2_hash_t* AXIS2_CALL axis2_hash_make_custom (const axis2_env_t *env
    			, axis2_hashfunc_t hash_func);
 
 /**
@@ -94,7 +94,7 @@
  * @return The hash table just created
  * @remark Makes a shallow copy
  */
-  AXIS2_DECLARE(axis2_hash_t*) axis2_hash_copy (const axis2_hash_t *ht
+  AXIS2_EXTERN axis2_hash_t* AXIS2_CALL axis2_hash_copy (const axis2_hash_t *ht
   			, const axis2_env_t *env);
 
 /**
@@ -105,7 +105,7 @@
  * @param val Value to associate with the key
  * @remark If the value is NULL the hash entry is deleted.
  */
-  AXIS2_DECLARE(void) axis2_hash_set (axis2_hash_t *ht, const void *key
+  AXIS2_EXTERN void AXIS2_CALL axis2_hash_set (axis2_hash_t *ht, const void *key
   			, axis2_ssize_t klen, const void *val);
 
 /**
@@ -115,7 +115,7 @@
  * @param klen Length of the key. Can be AXIS2_HASH_KEY_STRING to use the string length.
  * @return Returns NULL if the key is not present.
  */
-   AXIS2_DECLARE(void*) axis2_hash_get (axis2_hash_t *ht, const void *key
+   AXIS2_EXTERN void* AXIS2_CALL axis2_hash_get (axis2_hash_t *ht, const void *key
    			, axis2_ssize_t klen);
 
 /**
@@ -146,7 +146,7 @@
  * }
  * </PRE>
  */
- AXIS2_DECLARE(axis2_hash_index_t*) axis2_hash_first (axis2_hash_t *ht
+ AXIS2_EXTERN axis2_hash_index_t* AXIS2_CALL axis2_hash_first (axis2_hash_t *ht
  			,const axis2_env_t *env);
 
 /**
@@ -155,7 +155,7 @@
  * @return a pointer to the updated iteration state.  NULL if there are no more  
  *         entries.
  */
- AXIS2_DECLARE(axis2_hash_index_t*) axis2_hash_next (const axis2_env_t *env
+ AXIS2_EXTERN axis2_hash_index_t* AXIS2_CALL axis2_hash_next (const axis2_env_t *env
  			, axis2_hash_index_t *hi);
 
 /**
@@ -167,7 +167,7 @@
  * @remark The return pointers should point to a variable that will be set to the
  *         corresponding data, or they may be NULL if the data isn't interesting.
  */
- AXIS2_DECLARE(void) axis2_hash_this (axis2_hash_index_t *hi, const void **key
+ AXIS2_EXTERN void AXIS2_CALL axis2_hash_this (axis2_hash_index_t *hi, const void **key
             , axis2_ssize_t *klen, void **val);
 
 /**
@@ -175,7 +175,7 @@
  * @param ht The hash table
  * @return The number of key/value pairs in the hash table.
  */
-  AXIS2_DECLARE( unsigned int ) axis2_hash_count (axis2_hash_t *ht);
+  AXIS2_EXTERN  unsigned int AXIS2_CALL axis2_hash_count (axis2_hash_t *ht);
 
 /**
  * Merge two hash tables into one new hash table. The values of the overlay
@@ -186,7 +186,7 @@
  * @param base The table that represents the initial values of the new table
  * @return A new hash table containing all of the data from the two passed in
  */
-  AXIS2_DECLARE(axis2_hash_t*) axis2_hash_overlay (const axis2_hash_t *overlay
+  AXIS2_EXTERN axis2_hash_t* AXIS2_CALL axis2_hash_overlay (const axis2_hash_t *overlay
   			,const axis2_env_t *env, const axis2_hash_t *base);
 
 /**
@@ -203,7 +203,7 @@
  * @param data Client data to pass to the merger function
  * @return A new hash table containing all of the data from the two passed in
  */
-  AXIS2_DECLARE(axis2_hash_t*) axis2_hash_merge (const axis2_hash_t *h1
+  AXIS2_EXTERN axis2_hash_t* AXIS2_CALL axis2_hash_merge (const axis2_hash_t *h1
   			, const axis2_env_t *env, const axis2_hash_t *h2
             , void *(*merger) (const axis2_env_t *env, const void *key
             , axis2_ssize_t klen, const void *h1_val, const void *h2_val
@@ -217,7 +217,7 @@
  *
  */
 									
-AXIS2_DECLARE(axis2_status_t) axis2_hash_free(axis2_hash_t *ht
+AXIS2_EXTERN axis2_status_t AXIS2_CALL axis2_hash_free(axis2_hash_t *ht
 		, const axis2_env_t *env);
 									
 /**
@@ -227,7 +227,7 @@
  * @return return status code
  */
 
-AXIS2_DECLARE(axis2_status_t)
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_hash_free_void_arg (void *ht_void, const axis2_env_t* env);
 
 /** @} */

Modified: webservices/axis2/trunk/c/util/include/axis2_linked_list.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_linked_list.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_linked_list.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_linked_list.h Wed May 31 18:36:55 2006
@@ -313,7 +313,7 @@
 /**
 * Create an empty linked list.
 */
-AXIS2_DECLARE(axis2_linked_list_t*) axis2_linked_list_create(const axis2_env_t *env);    
+AXIS2_EXTERN axis2_linked_list_t* AXIS2_CALL axis2_linked_list_create(const axis2_env_t *env);    
     
 #define AXIS2_LINKED_LIST_FREE(linked_list, env) \
         ((linked_list)->ops->free(linked_list, env))

Modified: webservices/axis2/trunk/c/util/include/axis2_log.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_log.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_log.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_log.h Wed May 31 18:36:55 2006
@@ -122,35 +122,35 @@
 
     };
 
-AXIS2_DECLARE(axis2_status_t) 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_log_impl_log_critical(axis2_log_t *log, 
 		 					const axis2_char_t *filename, 
 							const int linenumber,
 							const axis2_char_t *format,...);
 
-AXIS2_DECLARE(axis2_status_t) 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_log_impl_log_error(axis2_log_t *log,
 						 const axis2_char_t *filename,
 						 const int linenumber,
 						 const axis2_char_t *format,...);
 
-AXIS2_DECLARE(axis2_status_t) 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_log_impl_log_warning(axis2_log_t *log,
 						   const axis2_char_t *filename,
 	                       const int linenumber,
 	                       const axis2_char_t *format,...);
 
-AXIS2_DECLARE(axis2_status_t) 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_log_impl_log_info(axis2_log_t *log, 
 						const axis2_char_t *format,...);
 
-AXIS2_DECLARE(axis2_status_t) 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_log_impl_log_debug(axis2_log_t *log,
 						 const axis2_char_t *filename,
 						 const int linenumber,
 						 const axis2_char_t *format,...);
 
-AXIS2_DECLARE(axis2_status_t) 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_log_impl_log_trace(axis2_log_t *log,
                          const axis2_char_t *filename,
 						 const int linenumber,

Modified: webservices/axis2/trunk/c/util/include/axis2_log_default.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_log_default.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_log_default.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_log_default.h Wed May 31 18:36:55 2006
@@ -43,9 +43,9 @@
     * @param allocator allocator to be used. Mandatory, cannot be NULL    
     * @return pointer to the newly created log struct 
     */
-    AXIS2_DECLARE(axis2_log_t *) axis2_log_create (axis2_allocator_t * allocator,
+    AXIS2_EXTERN axis2_log_t * AXIS2_CALL axis2_log_create (axis2_allocator_t * allocator,
                      axis2_log_ops_t * ops, axis2_char_t * stream_name);
-    AXIS2_DECLARE(axis2_char_t *) axis2_log_impl_get_time_str(void);
+    AXIS2_EXTERN axis2_char_t *AXIS2_CALL  axis2_log_impl_get_time_str(void);
 
 /** @} */
     

Modified: webservices/axis2/trunk/c/util/include/axis2_network_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_network_handler.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_network_handler.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_network_handler.h Wed May 31 18:36:55 2006
@@ -43,7 +43,7 @@
  * @param port port of the service
  * @return opened socket
  */ 
-AXIS2_DECLARE(axis2_socket_t) 
+AXIS2_EXTERN axis2_socket_t AXIS2_CALL 
 axis2_network_handler_open_socket(const axis2_env_t *env, 
 								  char *server, 
 								  int port);
@@ -53,7 +53,7 @@
  * @param port port of the socket to be bound
  * @return creates server socket
  */ 
-AXIS2_DECLARE(axis2_socket_t) 
+AXIS2_EXTERN axis2_socket_t AXIS2_CALL 
 axis2_network_handler_create_server_socket(const axis2_env_t *env, 
 										   int port);
 
@@ -62,7 +62,7 @@
  * @param opened socket that need to be closed
  * @return status code
  */
-AXIS2_DECLARE(axis2_status_t) 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_network_handler_close_socket (const axis2_env_t *env, 
 									axis2_socket_t socket);
 
@@ -73,7 +73,7 @@
  * @param value Value to be set
  * @return status of the operations as axis2_status_t
  */
-AXIS2_DECLARE(axis2_status_t)
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_network_handler_set_sock_option(const axis2_env_t *env, 
 									  axis2_socket_t socket, 
 									  int option,
@@ -83,7 +83,7 @@
  * @param socket valid server socket (obtained by socket() or similar call)
  * @return created socket to handle the incoming client connection
  */						
-AXIS2_DECLARE(axis2_socket_t)						
+AXIS2_EXTERN axis2_socket_t AXIS2_CALL						
 axis2_network_handler_svr_socket_accept(const axis2_env_t *env, 
 										axis2_socket_t socket);
 
@@ -92,7 +92,7 @@
  * @param socket valid socket (obtained by accept() or similar call)
  * @return ip address asoociated with the socket or NULL
  */
-AXIS2_DECLARE(axis2_char_t *)
+AXIS2_EXTERN axis2_char_t * AXIS2_CALL
 axis2_network_handler_get_svr_ip(const axis2_env_t *env, 
 								 axis2_socket_t socket);
 /** @} */

Modified: webservices/axis2/trunk/c/util/include/axis2_param.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_param.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_param.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_param.h Wed May 31 18:36:55 2006
@@ -156,7 +156,7 @@
 /**
  * creates param struct
  */
-AXIS2_DECLARE(axis2_param_t*) 
+AXIS2_EXTERN axis2_param_t* AXIS2_CALL 
 axis2_param_create(const axis2_env_t *env, 
 						axis2_char_t *name, 
 						void *value);

Modified: webservices/axis2/trunk/c/util/include/axis2_param_container.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_param_container.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_param_container.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_param_container.h Wed May 31 18:36:55 2006
@@ -118,7 +118,7 @@
  * Creates param container struct
  * @return pointer to newly created param container
  */
-AXIS2_DECLARE(axis2_param_container_t *) 
+AXIS2_EXTERN axis2_param_container_t * AXIS2_CALL 
 axis2_param_container_create (const axis2_env_t *env);
 
 /**
@@ -126,7 +126,7 @@
  * cast into appropriate type and then pass the cast object
  * into the param_container structure's free method
  */
-AXIS2_DECLARE(axis2_status_t) 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_param_container_free_void_arg (void *param_container,
                                         const axis2_env_t *env);
                                     

Modified: webservices/axis2/trunk/c/util/include/axis2_property.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_property.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_property.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_property.h Wed May 31 18:36:55 2006
@@ -81,7 +81,7 @@
  * create new property
  * @return property newly created property
  */
-AXIS2_DECLARE(axis2_property_t *)
+AXIS2_EXTERN axis2_property_t * AXIS2_CALL
 axis2_property_create(const axis2_env_t *env);
 
 /*************************** Function macros **********************************/

Modified: webservices/axis2/trunk/c/util/include/axis2_qname.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_qname.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_qname.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_qname.h Wed May 31 18:36:55 2006
@@ -127,7 +127,7 @@
  * @return a pointer to newly created qname struct
  */
 
-AXIS2_DECLARE(axis2_qname_t *)
+AXIS2_EXTERN axis2_qname_t * AXIS2_CALL
 axis2_qname_create (const axis2_env_t *env,
                     const axis2_char_t * localpart,
                     const axis2_char_t * namespace_uri,
@@ -140,7 +140,7 @@
  * freeing the returned qname is users responsibility
  */           
 
-AXIS2_DECLARE(axis2_qname_t*) 
+AXIS2_EXTERN axis2_qname_t* AXIS2_CALL 
 axis2_qname_create_from_string(const axis2_env_t *env,
                                const axis2_char_t *string);
 	

Modified: webservices/axis2/trunk/c/util/include/axis2_stack.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_stack.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_stack.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_stack.h Wed May 31 18:36:55 2006
@@ -91,7 +91,7 @@
     axis2_stack_ops_t *ops;
 };
 
-AXIS2_DECLARE(axis2_stack_t *)
+AXIS2_EXTERN axis2_stack_t * AXIS2_CALL
 axis2_stack_create(const axis2_env_t *env);
  
  

Modified: webservices/axis2/trunk/c/util/include/axis2_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_stream.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_stream.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_stream.h Wed May 31 18:36:55 2006
@@ -161,20 +161,20 @@
 /** \brief Constructor for creating an in memory stream
   * @return axis2_stream (in memory)
   */
-AXIS2_DECLARE(axis2_stream_t *) axis2_stream_create_basic (const axis2_env_t *env);
+AXIS2_EXTERN axis2_stream_t *AXIS2_CALL axis2_stream_create_basic (const axis2_env_t *env);
 
 /** \brief Constructor for creating a file stream
   * @param valid file pointer (opened file)
   * @return axis2_stream (file)
   */
-AXIS2_DECLARE(axis2_stream_t *)
+AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
 axis2_stream_create_file (const axis2_env_t *env, FILE *fp);
 
 /** \brief Constructor for creating a file stream
   * @param valid socket (opened socket)
   * @return axis2_stream (socket)
   */
-AXIS2_DECLARE(axis2_stream_t *)
+AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
 axis2_stream_create_socket (const axis2_env_t *env, int socket);
 
 /**
@@ -182,7 +182,7 @@
  * cast into appropriate type and then pass the cast object
  * into the module_desc structure's free method
  */
-AXIS2_DECLARE(axis2_status_t) 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_stream_free_void_arg (void *stream,
                             const axis2_env_t *env);
 

Modified: webservices/axis2/trunk/c/util/include/axis2_string.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_string.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_string.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_string.h Wed May 31 18:36:55 2006
@@ -33,22 +33,22 @@
  * @{
  */
 
-    AXIS2_DECLARE(void*)
+    AXIS2_EXTERN void* AXIS2_CALL
     axis2_strdup (const void *ptr, 
                   const axis2_env_t *env);
 
-    AXIS2_DECLARE(int)
+    AXIS2_EXTERN int AXIS2_CALL
     axis2_strcmp (const axis2_char_t * s1, 
                   const axis2_char_t * s2);
 
-    AXIS2_DECLARE(axis2_ssize_t)
+    AXIS2_EXTERN axis2_ssize_t AXIS2_CALL
     axis2_strlen(const axis2_char_t * s);
 
-    AXIS2_DECLARE(int)
+    AXIS2_EXTERN int AXIS2_CALL
     axis2_strcasecmp(const axis2_char_t *s1, 
                      axis2_char_t *s2);
 
-    AXIS2_DECLARE(int)
+    AXIS2_EXTERN int AXIS2_CALL
     axis2_strncasecmp(const axis2_char_t *s1, 
                       axis2_char_t *s2, int n);
     
@@ -57,16 +57,16 @@
      * modifying the first argument. The user should free the allocated
      * memory for the return value
      */
-    AXIS2_DECLARE(axis2_char_t*)
+    AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axis2_stracat(const axis2_char_t *s1, const 
                   axis2_char_t *s2, 
                   const axis2_env_t *env);
     
-    AXIS2_DECLARE(axis2_char_t *)
+    AXIS2_EXTERN axis2_char_t * AXIS2_CALL
     axis2_strstr (const axis2_char_t *heystack,
                   const axis2_char_t *needle);
 
-    AXIS2_DECLARE(axis2_char_t *)
+    AXIS2_EXTERN axis2_char_t * AXIS2_CALL
     axis2_rindex(const axis2_char_t *s, 
                  axis2_char_t c);
 

Modified: webservices/axis2/trunk/c/util/include/axis2_string_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_string_util.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_string_util.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_string_util.h Wed May 31 18:36:55 2006
@@ -24,17 +24,17 @@
 {
 #endif
 
-AXIS2_DECLARE(axis2_array_list_t *)
+AXIS2_EXTERN axis2_array_list_t * AXIS2_CALL
 axis2_tokenize(const axis2_env_t *env,
                axis2_char_t *in, 
                int delim);
 
-AXIS2_DECLARE(axis2_array_list_t *)
+AXIS2_EXTERN axis2_array_list_t * AXIS2_CALL
 axis2_first_token(const axis2_env_t *env,
                   axis2_char_t *in,
                   int delim);
 
-AXIS2_DECLARE(axis2_array_list_t *)
+AXIS2_EXTERN axis2_array_list_t * AXIS2_CALL
 axis2_last_token(const axis2_env_t *env,
                  axis2_char_t *in,
                  int delim);

Modified: webservices/axis2/trunk/c/util/include/axis2_thread.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_thread.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_thread.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_thread.h Wed May 31 18:36:55 2006
@@ -69,7 +69,7 @@
  * @param cont The pool to use
  * @return Newly created thread attribute
  */
-AXIS2_DECLARE(axis2_threadattr_t*) 
+AXIS2_EXTERN axis2_threadattr_t* AXIS2_CALL 
 axis2_threadattr_create(axis2_allocator_t *allocator);
 
 /**
@@ -78,7 +78,7 @@
  * @param on Non-zero if detached threads should be created.
  * @return The status of the operation
  */
-AXIS2_DECLARE(axis2_status_t)
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_threadattr_detach_set(axis2_threadattr_t *attr, axis2_bool_t detached);
 
 /**
@@ -87,7 +87,7 @@
  * @return AXIS2_TRUE if threads are to be detached, or AXIS2_FALSE
  * if threads are to be joinable.
  */
-AXIS2_DECLARE(axis2_bool_t)
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axis2_threadattr_is_detach(axis2_threadattr_t *attr, axis2_allocator_t *allocator);
 
 
@@ -99,7 +99,7 @@
  * @param cont The pool to use
  * @return The newly created thread handle.
  */
-AXIS2_DECLARE(axis2_thread_t*) 
+AXIS2_EXTERN axis2_thread_t* AXIS2_CALL 
 axis2_thread_create(axis2_allocator_t *allocator, axis2_threadattr_t *attr,
                         axis2_thread_start_t func, void *data);
 
@@ -108,7 +108,7 @@
  * @param thd The thread to stop
  * @return The status of the operation
  */
-AXIS2_DECLARE(axis2_status_t) 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_thread_exit(axis2_thread_t *thd, axis2_allocator_t *allocator);
 
 /**
@@ -116,13 +116,13 @@
  * @param thd The thread to join
  * @return The status of the operation
  */
-AXIS2_DECLARE(axis2_status_t) 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_thread_join(axis2_thread_t *thd);
 
 /**
  * force the current thread to yield the processor
  */
-AXIS2_DECLARE(void) 
+AXIS2_EXTERN void AXIS2_CALL 
 axis2_thread_yield();
 
 /**
@@ -130,7 +130,7 @@
  * @param control The control variable to initialize
  * @return The status of the operation
  */
-AXIS2_DECLARE(axis2_thread_once_t*) 
+AXIS2_EXTERN axis2_thread_once_t* AXIS2_CALL 
 axis2_thread_once_init(axis2_allocator_t *allocator);
 
 /**
@@ -143,7 +143,7 @@
  * @param func The function to call.
  * @return The status of the operation
  */
-AXIS2_DECLARE(axis2_status_t)
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_thread_once(axis2_thread_once_t *control, void (*func)(void));
 
 /**
@@ -151,7 +151,7 @@
  * @param thd The thread to detach
  * @return The status of the operation
  */
-AXIS2_DECLARE(axis2_status_t) 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_thread_detach(axis2_thread_t *thd);
 
 /*************************Thread locking functions*****************************/
@@ -170,14 +170,14 @@
  * most optimial mutex based on a given platform's performance charateristics,
  * it will behave as either a nested or an unnested lock.
  */
-AXIS2_DECLARE(axis2_thread_mutex_t *)
+AXIS2_EXTERN axis2_thread_mutex_t * AXIS2_CALL
 axis2_thread_mutex_create(axis2_allocator_t *allocator, unsigned int flags);
 /**
  * Acquire the lock for the given mutex. If the mutex is already locked,
  * the current thread will be put to sleep until the lock becomes available.
  * @param mutex the mutex on which to acquire the lock.
  */
-AXIS2_DECLARE(axis2_status_t) 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_thread_mutex_lock(axis2_thread_mutex_t *mutex);
 
 /**
@@ -185,21 +185,21 @@
  * been acquired, the call returns immediately 
  * @param mutex the mutex on which to attempt the lock acquiring.
  */
-AXIS2_DECLARE(axis2_status_t) 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_thread_mutex_trylock(axis2_thread_mutex_t *mutex);
 
 /**
  * Release the lock for the given mutex.
  * @param mutex the mutex from which to release the lock.
  */
-AXIS2_DECLARE(axis2_status_t) 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_thread_mutex_unlock(axis2_thread_mutex_t *mutex);
 
 /**
  * Destroy the mutex and free the memory associated with the lock.
  * @param mutex the mutex to destroy.
  */
-AXIS2_DECLARE(axis2_status_t)
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_thread_mutex_destroy(axis2_thread_mutex_t *mutex);
 
 /** @} */

Modified: webservices/axis2/trunk/c/util/include/axis2_thread_pool.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_thread_pool.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_thread_pool.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_thread_pool.h Wed May 31 18:36:55 2006
@@ -103,14 +103,14 @@
 * @param allocator user defined allocator for the memory allocation.
 * @return initialized thread_pool. NULL on error.
 */
-AXIS2_DECLARE(axis2_thread_pool_t *) axis2_thread_pool_init(
+AXIS2_EXTERN axis2_thread_pool_t * AXIS2_CALL axis2_thread_pool_init(
 					axis2_allocator_t *allocator);
 
 /**
  * This function can be used to initialize the environment in case of 
  * spawning a new thread via a thread function
  */
-AXIS2_DECLARE (struct axis2_env *)
+AXIS2_EXTERN struct axis2_env * AXIS2_CALL
 axis2_init_thread_env(const struct axis2_env *system_env);
 
 #define AXIS2_THREAD_POOL_GET_THREAD(thread_pool, func, data) \

Modified: webservices/axis2/trunk/c/util/include/axis2_types.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_types.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_types.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_types.h Wed May 31 18:36:55 2006
@@ -32,7 +32,7 @@
  * @{
  */
 
-    AXIS2_DECLARE(int)
+    AXIS2_EXTERN int AXIS2_CALL
     axis2_atoi (const char *s);
 
 #define AXIS2_ATOI(s) axis2_atoi(s)

Modified: webservices/axis2/trunk/c/util/include/axis2_url.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_url.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_url.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_url.h Wed May 31 18:36:55 2006
@@ -108,7 +108,7 @@
 };
 
 
-AXIS2_DECLARE(axis2_url_t *) 
+AXIS2_EXTERN axis2_url_t * AXIS2_CALL 
 axis2_url_create (const axis2_env_t *env, 
 				  axis2_char_t *protocol, 
 				  axis2_char_t *server, 
@@ -116,7 +116,7 @@
                   axis2_char_t *path);
 
 
-AXIS2_DECLARE(axis2_url_t *)
+AXIS2_EXTERN axis2_url_t * AXIS2_CALL
 axis2_url_parse_string(const axis2_env_t *env, 
                        axis2_char_t *str_url);
 

Modified: webservices/axis2/trunk/c/util/include/axis2_utils.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_utils.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_utils.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_utils.h Wed May 31 18:36:55 2006
@@ -134,7 +134,7 @@
      * @param request url
      * @return axis2_char_t ** <code>axis2_char_t **<code>
      */
-    AXIS2_DECLARE(axis2_char_t**)
+    AXIS2_EXTERN axis2_char_t** AXIS2_CALL
     axis2_parse_request_url_for_svc_and_op(const axis2_env_t *env, axis2_char_t *request);
     
 /** @} */

Modified: webservices/axis2/trunk/c/util/include/axis2_utils_defines.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_utils_defines.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_utils_defines.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_utils_defines.h Wed May 31 18:36:55 2006
@@ -113,14 +113,14 @@
 
 #if !defined(WIN32)
 /**
- * Axis2 Core functions are declared with AXIS2_DECLARE(), so they may
+ * Axis2 Core functions are declared with AXIS2_EXTERN  AXIS2_CALL, so they may
  * use the most appropriate calling convention.  Other
  * Core functions with variable arguments must use AXIS2_DECLARE_NONSTD().
  * @code
- * AXIS2_DECLARE(rettype) axis2_func(args)
+ * AXIS2_EXTERN rettype) axis2_func(args AXIS2_CALL
  * @endcode
  */
-#define AXIS2_DECLARE(type)            type AXIS2_CALL
+#define AXIS2_EXTERN 
 
 /**
  * Axis2 Core variable argument and hook functions are declared with 
@@ -143,16 +143,16 @@
 #define AXIS2_DECLARE_DATA
 
 #elif defined(AXIS2_DECLARE_STATIC)
-#define AXIS2_DECLARE(type)            type AXIS2_CALL
-#define AXIS2_DECLARE_NONSTD(type)     type
+#define AXIS2_EXTERN            
+#define AXIS2_EXTERN_NONSTD
 #define AXIS2_DECLARE_DATA
 #elif defined(AXIS2_DECLARE_EXPORT)
-#define AXIS2_DECLARE(type)            AXIS2_EXPORT type AXIS2_CALL
-#define AXIS2_DECLARE_NONSTD(type)     AXIS2_EXPORT type
+#define AXIS2_EXTERN                    AXIS2_EXPORT
+#define AXIS2_EXTERN_NONSTD             AXIS2_EXPORT
 #define AXIS2_DECLARE_DATA             
 #else
-#define AXIS2_DECLARE(type)            AXIS2_IMPORT type AXIS2_CALL
-#define AXIS2_DECLARE_NONSTD(type)     AXIS2_IMPORT type
+#define AXIS2_EXTERN                    AXIS2_IMPORT
+#define AXIS2_EXTERN_NONSTD             AXIS2_IMPORT
 #define AXIS2_DECLARE_DATA             
 #endif
 

Modified: webservices/axis2/trunk/c/util/include/axis2_uuid_gen.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_uuid_gen.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_uuid_gen.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_uuid_gen.h Wed May 31 18:36:55 2006
@@ -39,7 +39,7 @@
  * generate a uuid
  * @return generated uuid as a string
  */ 
-AXIS2_DECLARE (axis2_char_t*)
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axis2_uuid_gen(const axis2_env_t *env);
 
 /** @} */

Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h Wed May 31 18:36:55 2006
@@ -59,29 +59,29 @@
   * Close the directory stream DIRP.
   * Return 0 if successful, -1 otherwise.
   */
-AXIS2_DECLARE(int) closedir(DIR *);
+AXIS2_EXTERN int) closedir(DIR *);
 
 /**
   * Read a directory entry from DIRP.  Return a pointer to a `struct
   * dirent' describing the entry, or NULL for EOF or error.
   */
-AXIS2_DECLARE(struct dirent *) readdir(DIR *);
+AXIS2_EXTERN truct dirent *) readdir(DIR *);
 
 /**
   * Reentrant version of `readdir'
   */
-AXIS2_DECLARE(int) readdir_r(DIR *, struct dirent *, struct dirent **);
+AXIS2_EXTERN int) readdir_r(DIR *, struct dirent *, struct dirent **);
 
 /**
   * Rewind DIRP to the beginning of the directory.
   */
-AXIS2_DECLARE(int) rewinddir(DIR *);
+AXIS2_EXTERN int) rewinddir(DIR *);
 
 /**
   * Scan the directory DIR
   *  Returns the number of entries selected, or -1 on error
   */
-AXIS2_DECLARE(int) scandir(const char *_dirname, struct dirent **__namelist[], int (*selector) (const struct dirent *entry), int (*compare) (const struct dirent **a, const struct dirent **b));
+AXIS2_EXTERN int) scandir(const char *_dirname, struct dirent **__namelist[], int (*selector) (const struct dirent *entry), int (*compare) (const struct dirent **a, const struct dirent **b));
 
 /**
   * Compare two `struct dirent's alphabetically

Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h Wed May 31 18:36:55 2006
@@ -36,7 +36,7 @@
   * @param __shortopts options
   * @return option char if successful, -1 if over, ':' or '?' if error
   */
-AXIS2_DECLARE(int) axis2_getopt(int __argc, char * const *__argv, const char *__shortopts);
+AXIS2_EXTERN int) axis2_getopt(int __argc, char * const *__argv, const char *__shortopts);
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_uuid_gen_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_uuid_gen_windows.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_uuid_gen_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_uuid_gen_windows.h Wed May 31 18:36:55 2006
@@ -30,7 +30,7 @@
   * Generate universally unique id
   * @return a char pointer to uuid
   */
-AXIS2_DECLARE(axis2_char_t *) axis2_platform_uuid_gen(char *s);
+AXIS2_EXTERN axis2_char_t *) axis2_platform_uuid_gen(char *s);
 
 /** @} */
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h Wed May 31 18:36:55 2006
@@ -144,7 +144,7 @@
 #define AXIS2_PRINTF_LONGLONG_FORMAT_SPECIFIER "%I64d"
 #define AXIS2_PRINTF_LONGLONG_FORMAT_SPECIFIER_CHARS "I64d"
 
-AXIS2_DECLARE(HMODULE) callLoadLib(LPCTSTR lib);
+AXIS2_EXTERN HMODULE) callLoadLib(LPCTSTR lib);
 
 /**
  * Platform specific path separator char

Modified: webservices/axis2/trunk/c/util/src/allocator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/allocator.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/allocator.c (original)
+++ webservices/axis2/trunk/c/util/src/allocator.c Wed May 31 18:36:55 2006
@@ -28,7 +28,7 @@
 axis2_allocator_free_impl(axis2_allocator_t *allocator, void *ptr);
 
 
-AXIS2_DECLARE(axis2_allocator_t *)
+AXIS2_EXTERN axis2_allocator_t * AXIS2_CALL
 axis2_allocator_init (axis2_allocator_t *allocator)
 {
     if (allocator)
@@ -48,7 +48,7 @@
     return NULL;
 }
 
-AXIS2_DECLARE(axis2_status_t)
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_allocator_free(axis2_allocator_t *allocator)
 {
     if(allocator)

Modified: webservices/axis2/trunk/c/util/src/array_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/array_list.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/array_list.c (original)
+++ webservices/axis2/trunk/c/util/src/array_list.c Wed May 31 18:36:55 2006
@@ -380,7 +380,7 @@
     return AXIS2_SUCCESS;
 }
 
-AXIS2_DECLARE(axis2_status_t) 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_array_list_free_void_arg(void *array_list, 
                                 const axis2_env_t *env)
 {

Modified: webservices/axis2/trunk/c/util/src/base64.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/base64.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/base64.c (original)
+++ webservices/axis2/trunk/c/util/src/base64.c Wed May 31 18:36:55 2006
@@ -87,7 +87,7 @@
 
 #endif /* __OS400__ */
 
-AXIS2_DECLARE(int) axis2_base64_decode_len(const char *bufcoded)
+AXIS2_EXTERN int AXIS2_CALL axis2_base64_decode_len(const char *bufcoded)
 {
     int nbytesdecoded;
     register const unsigned char *bufin;
@@ -102,7 +102,7 @@
     return nbytesdecoded + 1;
 }
 
-AXIS2_DECLARE(int) axis2_base64_decode(char *bufplain, const char *bufcoded)
+AXIS2_EXTERN int AXIS2_CALL axis2_base64_decode(char *bufplain, const char *bufcoded)
 {
     int len;
     len = axis2_base64_decode_binary((unsigned char *) bufplain, bufcoded);
@@ -114,7 +114,7 @@
  * the conversion of the output to ebcdic is left out.
  */
 
-AXIS2_DECLARE(int) axis2_base64_decode_binary(unsigned char *bufplain,
+AXIS2_EXTERN int AXIS2_CALL axis2_base64_decode_binary(unsigned char *bufplain,
                    const char *bufcoded)
 {
     int nbytesdecoded;
@@ -166,12 +166,12 @@
 static const char basis_64[] =
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
-AXIS2_DECLARE(int) axis2_base64_encode_len(int len)
+AXIS2_EXTERN int AXIS2_CALL axis2_base64_encode_len(int len)
 {
     return ((len + 2) / 3 * 4) + 1;
 }
 
-AXIS2_DECLARE(int) axis2_base64_encode(char *encoded, const char *string, int len)
+AXIS2_EXTERN int AXIS2_CALL axis2_base64_encode(char *encoded, const char *string, int len)
 {
 #ifndef __OS400__
     return axis2_base64_encode_binary(encoded, (const unsigned char *) string, len);
@@ -214,7 +214,7 @@
 /* This is the same as axis2_base64_encode() except on EBCDIC machines, where
  * the conversion of the input to ascii is left out.
  */
-AXIS2_DECLARE(int) axis2_base64_encode_binary(char *encoded,
+AXIS2_EXTERN int AXIS2_CALL axis2_base64_encode_binary(char *encoded,
                                       const unsigned char *string, int len)
 {
     int i;

Modified: webservices/axis2/trunk/c/util/src/class_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/class_loader.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/class_loader.c (original)
+++ webservices/axis2/trunk/c/util/src/class_loader.c Wed May 31 18:36:55 2006
@@ -25,14 +25,14 @@
                                 axis2_dll_desc_t *dll_desc);
                                 
                                 
-AXIS2_DECLARE(axis2_status_t)
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_class_loader_init(const axis2_env_t *env)
 {
     AXIS2_PLATFORM_LOADLIBINIT();
     return AXIS2_SUCCESS;
 }
 
-AXIS2_DECLARE(axis2_status_t)
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_class_loader_delete_dll (const axis2_env_t *env,
                                     axis2_dll_desc_t *dll_desc)
 { 
@@ -47,7 +47,7 @@
     return AXIS2_SUCCESS;
 }
 
-AXIS2_DECLARE(void *)
+AXIS2_EXTERN void * AXIS2_CALL
 axis2_class_loader_create_dll (const axis2_env_t *env,
                                 axis2_param_t *impl_info_param)
 {

Modified: webservices/axis2/trunk/c/util/src/dir_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/dir_handler.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/dir_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/dir_handler.c Wed May 31 18:36:55 2006
@@ -34,7 +34,7 @@
  * @param pathname path to your service or module directory
  * @return array list of dll file names
  */
-AXIS2_DECLARE(axis2_array_list_t *)
+AXIS2_EXTERN axis2_array_list_t * AXIS2_CALL
 axis2_dir_handler_list_services_or_modules_in_dir(const axis2_env_t *env,
                             axis2_char_t *pathname)   
 { 
@@ -184,7 +184,7 @@
  * @param pathname path  your modules or services folder
  * @return array list of contents of services or modules folder
  */
-AXIS2_DECLARE(axis2_array_list_t *)
+AXIS2_EXTERN axis2_array_list_t * AXIS2_CALL
 axis2_dir_handler_list_service_or_module_dirs(const axis2_env_t *env,
                             axis2_char_t *pathname)   
 { 

Modified: webservices/axis2/trunk/c/util/src/dll_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/dll_desc.c?rev=410712&r1=410711&r2=410712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/dll_desc.c (original)
+++ webservices/axis2/trunk/c/util/src/dll_desc.c Wed May 31 18:36:55 2006
@@ -115,7 +115,7 @@
                        
 /************************* End of function headers ****************************/	
 
-AXIS2_DECLARE(axis2_dll_desc_t *)
+AXIS2_EXTERN axis2_dll_desc_t * AXIS2_CALL
 axis2_dll_desc_create (const axis2_env_t *env)
 {
     axis2_dll_desc_impl_t *dll_desc_impl = NULL;



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


Mime
View raw message