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 sa...@apache.org on 2005/10/24 07:32:14 UTC
svn commit: r327976 - in /webservices/axis2/trunk/c: include/
modules/util/src/
Author: samisa
Date: Sun Oct 23 22:31:53 2005
New Revision: 327976
URL: http://svn.apache.org/viewcvs?rev=327976&view=rev
Log:
corrected calling convention problems in these files
Modified:
webservices/axis2/trunk/c/include/axis2_allocator.h
webservices/axis2/trunk/c/include/axis2_error.h
webservices/axis2/trunk/c/include/axis2_log.h
webservices/axis2/trunk/c/include/axis2_stream.h
webservices/axis2/trunk/c/include/axis2_string.h
webservices/axis2/trunk/c/modules/util/src/axis2_error.c
webservices/axis2/trunk/c/modules/util/src/axis2_log.c
webservices/axis2/trunk/c/modules/util/src/axis2_stream.c
Modified: webservices/axis2/trunk/c/include/axis2_allocator.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_allocator.h?rev=327976&r1=327975&r2=327976&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_allocator.h (original)
+++ webservices/axis2/trunk/c/include/axis2_allocator.h Sun Oct 23 22:31:53 2005
@@ -47,19 +47,19 @@
* @param size size of the memory block to be allocated
* @return pointer to the allocated memory block
*/
- AXIS2_DECLARE(void *) (*axis2_allocator_malloc) (size_t size);
+ AXIS2_DECLARE_DATA void * (AXIS2_CALL *axis2_allocator_malloc) (size_t size);
/**
* re-llocates memory
* @param ptr memory block who's size to be changed
* @param size size of the memory block to be allocated
* @return pointer to the allocated memory block
*/
- AXIS2_DECLARE(void *) (*axis2_allocator_realloc) (void *ptr, size_t size);
+ AXIS2_DECLARE_DATA void * (AXIS2_CALL *axis2_allocator_realloc) (void *ptr, size_t size);
/**
* frees memory
* @param ptr pointer to be freed
*/
- AXIS2_DECLARE(void) (*axis2_allocator_free) (void *ptr);
+ AXIS2_DECLARE_DATA void (AXIS2_CALL *axis2_allocator_free) (void *ptr);
} axis2_allocator_t;
/**
Modified: webservices/axis2/trunk/c/include/axis2_error.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_error.h?rev=327976&r1=327975&r2=327976&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_error.h (original)
+++ webservices/axis2/trunk/c/include/axis2_error.h Sun Oct 23 22:31:53 2005
@@ -45,7 +45,7 @@
* get error message for the last error
* @return error message for the last error. NULL on error.
*/
- AXIS2_DECLARE(axis2_char_t *) (*axis2_error_ops_get_message) ();
+ AXIS2_DECLARE_DATA axis2_char_t * (AXIS2_CALL *axis2_error_ops_get_message) ();
} axis2_error_ops_t;
/**
Modified: webservices/axis2/trunk/c/include/axis2_log.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_log.h?rev=327976&r1=327975&r2=327976&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_log.h (original)
+++ webservices/axis2/trunk/c/include/axis2_log.h Sun Oct 23 22:31:53 2005
@@ -63,7 +63,7 @@
* @param size size of the buffer to be written to log
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
- AXIS2_DECLARE(axis2_status_t) (*axis2_log_ops_write) (const void *buffer, size_t count);
+ AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_log_ops_write) (const void *buffer, size_t count);
} axis2_log_ops_t;
/**
Modified: webservices/axis2/trunk/c/include/axis2_stream.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_stream.h?rev=327976&r1=327975&r2=327976&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_stream.h (original)
+++ webservices/axis2/trunk/c/include/axis2_stream.h Sun Oct 23 22:31:53 2005
@@ -46,7 +46,7 @@
* @param size size of the buffer
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
- AXIS2_DECLARE(axis2_status_t) (*axis2_stream_ops_read) (void *buffer
+ AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_stream_ops_read) (void *buffer
, size_t count);
/**
* writes into stream
@@ -54,7 +54,7 @@
* @param size size of the buffer
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
- AXIS2_DECLARE(axis2_status_t) (*axis2_stream_ops_write)
+ AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_stream_ops_write)
(const void *buffer, size_t count);
/**
@@ -63,22 +63,22 @@
* @param options file options given.
* @return status code
*/
- AXIS2_DECLARE(void *) (*axis2_stream_ops_file_open)
- (const char *file_name, const char *options);
+ AXIS2_DECLARE_DATA (void *) (AXIS2_CALL *axis2_stream_ops_file_open)
+ (const char *file_name, const char *options);
/**
* close a file
* @param file_ptr file pointer of the file need to be closed
* @return status code
*/
- AXIS2_DECLARE(axis2_status_t) (*axis2_stream_ops_file_close)
+ AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_stream_ops_file_close)
(void *file_ptr);
/** reads a once character from a file
* @param file_ptr pointer to the file to be read from
* @return char read
*/
- AXIS2_DECLARE(axis2_char_t) (*axis2_stream_ops_file_get_char)
+ AXIS2_DECLARE_DATA axis2_char_t (AXIS2_CALL *axis2_stream_ops_file_get_char)
(void *file_ptr);
/** write a previously read character back to the file stream
@@ -87,7 +87,7 @@
* and need to be written back to
* @return status code
*/
- AXIS2_DECLARE(axis2_status_t) (*axis2_stream_ops_file_unget_char)
+ AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_stream_ops_file_unget_char)
(const char chr, void *file_ptr);
} axis2_stream_ops_t;
Modified: webservices/axis2/trunk/c/include/axis2_string.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_string.h?rev=327976&r1=327975&r2=327976&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_string.h (original)
+++ webservices/axis2/trunk/c/include/axis2_string.h Sun Oct 23 22:31:53 2005
@@ -44,14 +44,14 @@
* @param ptr string to be duplicated
* @return pointer to the duplicated string
*/
- AXIS2_DECLARE(void *) (*axis2_string_strdup) (const void *ptr);
+ AXIS2_DECLARE_DATA void * (AXIS2_CALL *axis2_string_strdup) (const void *ptr);
/**
* compares the given two strings
* @param s1 first string to be compared
* @param s2 second string to be compared
* @return 0 if the two strings are equal, else non zero
*/
- AXIS2_DECLARE(int) (*axis2_string_strcmp) (const axis2_char_t * s1,
+ AXIS2_DECLARE_DATA int (AXIS2_CALL *axis2_string_strcmp) (const axis2_char_t * s1,
const axis2_char_t * s2);
} axis2_string_t;
Modified: webservices/axis2/trunk/c/modules/util/src/axis2_error.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_error.c?rev=327976&r1=327975&r2=327976&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_error.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_error.c Sun Oct 23 22:31:53 2005
@@ -16,7 +16,7 @@
#include <axis2_error.h>
-axis2_char_t * axis2_error_impl_get_message ();
+axis2_char_t * AXIS2_CALL axis2_error_impl_get_message ();
axis2_error_t *
axis2_error_create (axis2_allocator_t * allocator)
Modified: webservices/axis2/trunk/c/modules/util/src/axis2_log.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_log.c?rev=327976&r1=327975&r2=327976&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_log.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_log.c Sun Oct 23 22:31:53 2005
@@ -17,7 +17,7 @@
#include <axis2_log.h>
#include <stdio.h>
-axis2_status_t axis2_log_impl_write (const void *buffer, size_t count);
+axis2_status_t AXIS2_CALL axis2_log_impl_write (const void *buffer, size_t count);
axis2_log_t *
axis2_log_create (axis2_allocator_t * allocator, axis2_log_ops_t * operations)
Modified: webservices/axis2/trunk/c/modules/util/src/axis2_stream.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_stream.c?rev=327976&r1=327975&r2=327976&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_stream.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_stream.c Sun Oct 23 22:31:53 2005
@@ -20,16 +20,16 @@
#include <axis2_stream.h>
-axis2_status_t axis2_stream_impl_write (const void *buffer, size_t count);
-axis2_status_t axis2_stream_impl_read (void *buffer, size_t count);
+axis2_status_t AXIS2_CALL axis2_stream_impl_write (const void *buffer, size_t count);
+axis2_status_t AXIS2_CALL axis2_stream_impl_read (void *buffer, size_t count);
-void *axis2_stream_impl_file_open(const char *file_name, const char *options);
+void* AXIS2_CALL axis2_stream_impl_file_open(const char *file_name, const char *options);
-axis2_status_t axis2_stream_impl_file_close(void *file_ptr);
+axis2_status_t AXIS2_CALL axis2_stream_impl_file_close(void *file_ptr);
-axis2_char_t axis2_stream_impl_file_get_char(void *file_ptr);
+axis2_char_t AXIS2_CALL axis2_stream_impl_file_get_char(void *file_ptr);
-axis2_status_t axis2_stream_impl_file_unget_char(const char chr, void *file_ptr);
+axis2_status_t AXIS2_CALL axis2_stream_impl_file_unget_char(const char chr, void *file_ptr);
axis2_stream_t *
axis2_stream_create (axis2_allocator_t * allocator,