stoddard 00/08/21 20:20:45
Modified: src ApacheCore.def
src/ap ap_buckets_refcount.c
src/include ap_buckets.h
Log:
Win32: function pointers use C calling convention unless explicitly set to use
stdcall. The 'split' function pointer in ap_buckets.h points to both static
functions
(which use C calling convention) and exported functions (which normally use
stdcall).
Let's settle on using the C calling convention.
Revision Changes Path
1.29 +7 -3 apache-2.0/src/ApacheCore.def
Index: ApacheCore.def
===================================================================
RCS file: /home/cvs/apache-2.0/src/ApacheCore.def,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ApacheCore.def 2000/08/15 15:41:30 1.28
+++ ApacheCore.def 2000/08/22 03:20:44 1.29
@@ -430,6 +430,10 @@
ap_xml_quote_string @454
ap_xml_quote_elem @455
ap_xml_insert_uri @456
-
-
-
+;
+; buckets
+ ap_bucket_create_transient @460
+ ap_bucket_split_shared @461
+ ap_bucket_make_shared @462
+ ap_bucket_destroy_shared @463
+
1.3 +1 -1 apache-2.0/src/ap/ap_buckets_refcount.c
Index: ap_buckets_refcount.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_refcount.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ap_buckets_refcount.c 2000/08/19 16:54:45 1.2
+++ ap_buckets_refcount.c 2000/08/22 03:20:44 1.3
@@ -58,7 +58,7 @@
#include "ap_buckets.h"
-API_EXPORT(apr_status_t) ap_bucket_split_shared(ap_bucket *a, apr_off_t
point)
+API_EXPORT_NONSTD(apr_status_t) ap_bucket_split_shared(ap_bucket *a,
apr_off_t point)
{
ap_bucket *b;
ap_bucket_shared *ad, *bd;
1.14 +1 -1 apache-2.0/src/include/ap_buckets.h
Index: ap_buckets.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/ap_buckets.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ap_buckets.h 2000/08/19 16:54:46 1.13
+++ ap_buckets.h 2000/08/22 03:20:45 1.14
@@ -447,7 +447,7 @@
* or APR_SUCCESS
* @deffunc API_EXPORT(apr_status_t) ap_bucket_shared_split(ap_bucket *b,
apr_off_t point)
*/
-API_EXPORT(apr_status_t) ap_bucket_split_shared(ap_bucket *b, apr_off_t
point);
+API_EXPORT_NONSTD(apr_status_t) ap_bucket_split_shared(ap_bucket *b,
apr_off_t point);
/* ***** Functions to Create Buckets of varying type ***** */
