axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shan...@apache.org
Subject svn commit: r890731 - in /webservices/axis2/trunk/c/src/core/transport/http: sender/http_sender.c server/apache2/apache2_stream.c server/apache2/mod_axis2.c util/http_transport_utils.c
Date Tue, 15 Dec 2009 10:08:03 GMT
Author: shankar
Date: Tue Dec 15 10:08:03 2009
New Revision: 890731

URL: http://svn.apache.org/viewvc?rev=890731&view=rev
Log:
fixing compilation issue in windows

Modified:
    webservices/axis2/trunk/c/src/core/transport/http/sender/http_sender.c
    webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_stream.c
    webservices/axis2/trunk/c/src/core/transport/http/server/apache2/mod_axis2.c
    webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c

Modified: webservices/axis2/trunk/c/src/core/transport/http/sender/http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/sender/http_sender.c?rev=890731&r1=890730&r2=890731&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/sender/http_sender.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/sender/http_sender.c Tue Dec 15 10:08:03
2009
@@ -137,7 +137,7 @@
     axis2_http_simple_request_t * request,
     axis2_char_t * header_data);
 
-static void
+static void AXIS2_CALL
 axis2_http_sender_connection_map_free(
     void *cm_void,
     const axutil_env_t *env);
@@ -3256,7 +3256,7 @@
     return sender->keep_alive;
 }
 
-static void 
+static void AXIS2_CALL
 axis2_http_sender_connection_map_free(
     void *cm_void,
     const axutil_env_t *env)

Modified: webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_stream.c?rev=890731&r1=890730&r2=890731&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_stream.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_stream.c Tue
Dec 15 10:08:03 2009
@@ -46,7 +46,7 @@
     void *buffer,
     size_t count);
 
-static int
+static int AXIS2_CALL
 apache2_stream_skip(
     axutil_stream_t * stream,
     const axutil_env_t * env,
@@ -148,7 +148,7 @@
     /* We are sure that the difference lies within the int range */
 }
 
-static int
+static int AXIS2_CALL
 apache2_stream_skip(
     axutil_stream_t * stream,
     const axutil_env_t * env,

Modified: webservices/axis2/trunk/c/src/core/transport/http/server/apache2/mod_axis2.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/server/apache2/mod_axis2.c?rev=890731&r1=890730&r2=890731&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/server/apache2/mod_axis2.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/server/apache2/mod_axis2.c Tue Dec 15
10:08:03 2009
@@ -742,9 +742,11 @@
     apr_dbd_results_t *res = NULL;
     apr_dbd_row_t *row = NULL;
     ap_dbd_t *dbd = NULL;
-
+    ap_dbd_t *(*authn_dbd_acquire_fn)(request_rec*) = NULL;
     request = (request_rec *) req;
-    dbd = ap_dbd_acquire(request);
+
+    authn_dbd_acquire_fn = APR_RETRIEVE_OPTIONAL_FN(ap_dbd_acquire);
+    dbd = authn_dbd_acquire_fn(request);
     if (!dbd) 
     {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, request,
@@ -804,10 +806,11 @@
     apr_dbd_prepared_t *statement;
     int affected_rows = -1;
     ap_dbd_t *dbd = NULL;
-
+    ap_dbd_t *(*authn_dbd_acquire_fn)(request_rec*) = NULL;
     request = (request_rec *) req;
 
-    dbd = ap_dbd_acquire(request);
+    authn_dbd_acquire_fn = APR_RETRIEVE_OPTIONAL_FN(ap_dbd_acquire);
+    dbd = authn_dbd_acquire_fn(request);
     if (!dbd) 
     {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, request,

Modified: webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c?rev=890731&r1=890730&r2=890731&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c Tue Dec
15 10:08:03 2009
@@ -3149,7 +3149,7 @@
          * mime_headers and SOAP */
         if(mime_part->type == AXIOM_MIME_PART_BUFFER)
         {
-            int written = 0;
+            size_t written = 0;
             while(written < mime_part->part_size)
             {
                 int len = 0;



Mime
View raw message