stas 2004/06/12 22:39:09
Modified: xs/APR/Bucket APR__Bucket.h
xs/tables/current/ModPerl FunctionTable.pm
. Changes
src/modules/perl modperl_bucket.c modperl_bucket.h
modperl_global.c modperl_global.h
Log:
amd64 fixes
- use IV insteaf of int where a pointer is used
- mpxs_APR__Bucket_new needs to use apr_size_t/off_set_t types
Submitted by: Joe Schaefer <[EMAIL PROTECTED]>
Revision Changes Path
1.11 +2 -2 modperl-2.0/xs/APR/Bucket/APR__Bucket.h
Index: APR__Bucket.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/APR/Bucket/APR__Bucket.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -u -r1.10 -r1.11
--- APR__Bucket.h 9 Jun 2004 14:46:22 -0000 1.10
+++ APR__Bucket.h 13 Jun 2004 05:39:08 -0000 1.11
@@ -16,10 +16,10 @@
#include "modperl_bucket.h"
static apr_bucket *mpxs_APR__Bucket_new(pTHX_ SV *classname, SV *sv,
- int offset, int len)
+ apr_off_t offset, apr_size_t len)
{
- int full_len;
+ apr_size_t full_len;
(void)SvPV(sv, full_len);
if (len) {
1.164 +7 -7 modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm
Index: FunctionTable.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -u -r1.163 -r1.164
--- FunctionTable.pm 9 Jun 2004 14:46:22 -0000 1.163
+++ FunctionTable.pm 13 Jun 2004 05:39:08 -0000 1.164
@@ -2,7 +2,7 @@
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Wed Jun 9 06:41:48 2004
+# ! Sun Jun 13 07:53:14 2004
# ! do NOT edit, any changes will be lost !
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -64,11 +64,11 @@
'name' => 'sv'
},
{
- 'type' => 'int',
+ 'type' => 'apr_off_t',
'name' => 'offset'
},
{
- 'type' => 'int',
+ 'type' => 'apr_size_t',
'name' => 'len'
}
]
@@ -1995,7 +1995,7 @@
'args' => []
},
{
- 'return_type' => 'int',
+ 'return_type' => 'IV',
'name' => 'modperl_global_get_threaded_mpm',
'args' => []
},
@@ -2058,7 +2058,7 @@
'name' => 'p'
},
{
- 'type' => 'int',
+ 'type' => 'IV',
'name' => 'threaded_mpm'
}
]
@@ -5398,11 +5398,11 @@
'name' => 'sv'
},
{
- 'type' => 'int',
+ 'type' => 'apr_off_t',
'name' => 'offset'
},
{
- 'type' => 'int',
+ 'type' => 'apr_size_t',
'name' => 'len'
}
]
1.390 +4 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -u -r1.389 -r1.390
--- Changes 9 Jun 2004 14:46:21 -0000 1.389
+++ Changes 13 Jun 2004 05:39:08 -0000 1.390
@@ -12,6 +12,10 @@
=item 1.99_15-dev
+amd64 fixes [Joe Schaefer <[EMAIL PROTECTED]>]
+ - use IV insteaf of int where a pointer is used
+ - mpxs_APR__Bucket_new needs to use apr_size_t/off_set_t types
+
APR::Socket::recv() now returns the length of the read data [Stas]
APR::Bucket's read() returns "" instead of undef when there is no data
1.11 +4 -2 modperl-2.0/src/modules/perl/modperl_bucket.c
Index: modperl_bucket.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_bucket.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -u -r1.10 -r1.11
--- modperl_bucket.c 21 May 2004 18:33:05 -0000 1.10
+++ modperl_bucket.c 13 Jun 2004 05:39:09 -0000 1.11
@@ -77,7 +77,8 @@
static apr_bucket *modperl_bucket_sv_make(pTHX_
apr_bucket *bucket,
SV *sv,
- int offset, int len)
+ apr_off_t offset,
+ apr_size_t len)
{
modperl_bucket_sv_t *svbucket;
@@ -107,7 +108,8 @@
return bucket;
}
-apr_bucket *modperl_bucket_sv_create(pTHX_ SV *sv, int offset, int len)
+apr_bucket *modperl_bucket_sv_create(pTHX_ SV *sv, apr_off_t offset,
+ apr_size_t len)
{
apr_bucket *bucket;
1.3 +2 -1 modperl-2.0/src/modules/perl/modperl_bucket.h
Index: modperl_bucket.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_bucket.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- modperl_bucket.h 4 Mar 2004 06:01:06 -0000 1.2
+++ modperl_bucket.h 13 Jun 2004 05:39:09 -0000 1.3
@@ -16,6 +16,7 @@
#ifndef MODPERL_BUCKET_H
#define MODPERL_BUCKET_H
-apr_bucket *modperl_bucket_sv_create(pTHX_ SV *sv, int offset, int len);
+apr_bucket *modperl_bucket_sv_create(pTHX_ SV *sv, apr_off_t offset,
+ apr_size_t len);
#endif /* MODPERL_BUCKET_H */
1.9 +1 -1 modperl-2.0/src/modules/perl/modperl_global.c
Index: modperl_global.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_global.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- modperl_global.c 4 Mar 2004 06:01:07 -0000 1.8
+++ modperl_global.c 13 Jun 2004 05:39:09 -0000 1.9
@@ -165,7 +165,7 @@
MP_GLOBAL_IMPL(pconf, apr_pool_t *);
MP_GLOBAL_IMPL(server_rec, server_rec *);
-MP_GLOBAL_IMPL(threaded_mpm, int);
+MP_GLOBAL_IMPL(threaded_mpm, IV);
#if MP_THREADED
static apr_status_t modperl_tls_cleanup(void *data)
1.6 +1 -1 modperl-2.0/src/modules/perl/modperl_global.h
Index: modperl_global.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_global.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- modperl_global.h 4 Mar 2004 06:01:07 -0000 1.5
+++ modperl_global.h 13 Jun 2004 05:39:09 -0000 1.6
@@ -59,7 +59,7 @@
MP_GLOBAL_DECL(pconf, apr_pool_t *);
MP_GLOBAL_DECL(server_rec, server_rec *);
-MP_GLOBAL_DECL(threaded_mpm, int);
+MP_GLOBAL_DECL(threaded_mpm, IV);
apr_status_t modperl_tls_create(apr_pool_t *p, modperl_tls_t **key);
apr_status_t modperl_tls_get(modperl_tls_t *key, void **data);
