You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by na...@apache.org on 2006/02/09 11:10:17 UTC
svn commit: r376245 - in /webservices/axis2/trunk/c/modules:
core/deployment/dep_engine.c core/engine/engine.c
core/transport/http/sender/http_transport_sender.c
platforms/windows/axis2_windows.h util/network_handler.c util/stream.c
Author: nandika
Date: Thu Feb 9 02:10:16 2006
New Revision: 376245
URL: http://svn.apache.org/viewcvs?rev=376245&view=rev
Log:
modified to compile on windows
Modified:
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/engine/engine.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
webservices/axis2/trunk/c/modules/platforms/windows/axis2_windows.h
webservices/axis2/trunk/c/modules/util/network_handler.c
webservices/axis2/trunk/c/modules/util/stream.c
Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?rev=376245&r1=376244&r2=376245&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Thu Feb 9 02:10:16 2006
@@ -764,7 +764,7 @@
}
status = AXIS2_CONF_SET_PHASESINFO(engine_impl->conf, env, engine_impl->phases_info);
- if(AXIS2_SUCCESS != status)
+ if(AXIS2_SUCCESS != status)
{
AXIS2_REPOS_LISTENER_FREE(repos_listener, env);
AXIS2_CONF_FREE(engine_impl->conf, env);
Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/engine.c?rev=376245&r1=376244&r2=376245&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Thu Feb 9 02:10:16 2006
@@ -218,6 +218,8 @@
transport_sender = AXIS2_TRANSPORT_OUT_DESC_GET_SENDER(transport_out, env);
if (transport_sender)
AXIS2_TRANSPORT_SENDER_INVOKE(transport_sender, env, msg_ctx);
+ else
+ return AXIS2_FAILURE;
}
else
{
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c?rev=376245&r1=376244&r2=376245&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c Thu Feb 9 02:10:16 2006
@@ -467,7 +467,8 @@
/**
* Following block distinguish the exposed part of the dll.
*/
-int axis2_get_instance(struct axis2_transport_sender **inst,
+AXIS2_EXPORT int
+axis2_get_instance(struct axis2_transport_sender **inst,
axis2_env_t **env)
{
*inst = axis2_http_transport_sender_create(env);
@@ -480,7 +481,8 @@
return AXIS2_SUCCESS;
}
-int axis2_remove_instance(axis2_transport_sender_t *inst,
+AXIS2_EXPORT int
+axis2_remove_instance(axis2_transport_sender_t *inst,
axis2_env_t **env)
{
axis2_status_t status = AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/modules/platforms/windows/axis2_windows.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/platforms/windows/axis2_windows.h?rev=376245&r1=376244&r2=376245&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/platforms/windows/axis2_windows.h (original)
+++ webservices/axis2/trunk/c/modules/platforms/windows/axis2_windows.h Thu Feb 9 02:10:16 2006
@@ -42,17 +42,21 @@
#define _WINSOCKAPI_ /* Prevent inclusion of winsock.h in windows.h */
#include <windows.h>
+
/*for file access check*/
#include <io.h>
#include <sys/stat.h>
/*for network handling*/
#include <winsock2.h>
+#include <fcntl.h>
+#include <Mswsock.h>
/* for time */
#include <time.h>
#include <sys/timeb.h>
/* get opt */
#include <axis2_getopt_windows.h>
+
/***************************************************************
* Default paths to shared library/DLLs and files
***************************************************************
@@ -197,7 +201,7 @@
/** getopt function */
#define AXIS2_GETOPT axis2_getopt
-#define AXIS2_VSNPRINTF _vsnprintf
+#define AXIS2_VSNPRINTF _vsnprintf
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/modules/util/network_handler.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/network_handler.c?rev=376245&r1=376244&r2=376245&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/network_handler.c (original)
+++ webservices/axis2/trunk/c/modules/util/network_handler.c Thu Feb 9 02:10:16 2006
@@ -101,6 +101,13 @@
int err_code = 0;
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
+#if defined(WIN32)
+ if (is_init_socket == 0)
+ {
+ axis2_init_socket();
+ is_init_socket = 1;
+ }
+#endif
sock = socket(AF_INET, SOCK_STREAM, 0);
if(sock < 0)
{
Modified: webservices/axis2/trunk/c/modules/util/stream.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/stream.c?rev=376245&r1=376244&r2=376245&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/stream.c (original)
+++ webservices/axis2/trunk/c/modules/util/stream.c Thu Feb 9 02:10:16 2006
@@ -618,8 +618,9 @@
{
axis2_stream_impl_t *stream_impl = NULL;
int len = 0;
- AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_CRTICAL_FAILURE);
char buffer[2];
+ AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_CRTICAL_FAILURE);
+
if(-1 == AXIS2_INTF_TO_IMPL(stream)->socket)
{