Author: joes
Date: Sun Feb 13 19:29:46 2005
New Revision: 153704
URL: http://svn.apache.org/viewcvs?view=rev&rev=153704
Log:
Get the perl glue's build system working; now
configuring with "--enable-perl-glue" should yield
a successful "make".
Modified:
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/apreq_xs_postperl.h
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/maps/apreq_functions.map
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/maps/apreq_structures.map
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/maps/apreq_types.map
Modified:
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/apreq_xs_postperl.h
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/apreq_xs_postperl.h?view=diff&r1=153703&r2=153704
==============================================================================
---
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/apreq_xs_postperl.h
(original)
+++
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/apreq_xs_postperl.h
Sun Feb 13 19:29:46 2005
@@ -20,6 +20,9 @@
/* avoid namespace collisions from perl's XSUB.h */
#include "modperl_perl_unembed.h"
+/* required for modperl's T_HASHOBJ (typemap) */
+#include "modperl_common_util.h"
+
/* backward compatibility macros support */
#include "ppport.h"
@@ -242,7 +245,7 @@
val = SvPVbyte(ST(3), vlen); \
t = apreq_make_##type(pool, key, klen, val, vlen); \
XSprePUSH; \
- XPUSHs(sv_2mortal(apreq_xs_##type##2sv(t,class,SvRV(ST(1)))));
\
+ XPUSHs(sv_2mortal(apreq_xs_##type##2sv(t,class,SvRV(ST(1))))); \
XSRETURN(1); \
}
Modified:
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/maps/apreq_functions.map
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/maps/apreq_functions.map?view=diff&r1=153703&r2=153704
==============================================================================
---
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/maps/apreq_functions.map
(original)
+++
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/maps/apreq_functions.map
Sun Feb 13 19:29:46 2005
@@ -1,96 +1,96 @@
########## Apache::Request:: Functions ##########
-MODULE=Apache::Request PACKAGE=Apache::Request PREFIX=apreq_
- apreq_request | apreq_xs_request | const char *:class, void *:env, const char
*:qs=NULL
- apreq_param | apreq_xs_request_get |
-
-MODULE=Apache::Request PACKAGE=Apache::Request
- DEFINE_env | apreq_xs_request_env |
- DEFINE_args | apreq_xs_request_args_get |
- DEFINE_body | apreq_xs_request_body_get |
- DEFINE_config | apreq_xs_request_config |
- DEFINE_parse | apreq_xs_request_parse |
-
-MODULE=Apache::Request PACKAGE=Apache::Request::Table
PREFIX=Apache__Request__Table_
- DEFINE_get | apreq_xs_table_get |
- DEFINE_FETCH | apreq_xs_table_FETCH |
- DEFINE_set | apreq_xs_table_param_set |
- DEFINE_STORE | apreq_xs_table_param_set |
- DEFINE_add | apreq_xs_table_param_add |
- DEFINE_new | apreq_xs_table_request_make |
- DEFINE_NEXTKEY | apreq_xs_table_NEXTKEY |
- DEFINE_FIRSTKEY | apreq_xs_table_NEXTKEY |
- DEFINE_do | apreq_xs_table_do |
+#MODULE=Apache::Request PACKAGE=Apache::Request PREFIX=apreq_
+# apreq_request | apreq_xs_request | const char *:class, void *:env, const
char *:qs=NULL
+# apreq_param | apreq_xs_request_get |
+
+#MODULE=Apache::Request PACKAGE=Apache::Request
+# DEFINE_env | apreq_xs_request_env |
+# DEFINE_args | apreq_xs_request_args_get |
+# DEFINE_body | apreq_xs_request_body_get |
+# DEFINE_config | apreq_xs_request_config |
+# DEFINE_parse | apreq_xs_request_parse |
+
+#MODULE=Apache::Request PACKAGE=Apache::Request::Table
PREFIX=Apache__Request__Table_
+# DEFINE_get | apreq_xs_table_get |
+# DEFINE_FETCH | apreq_xs_table_FETCH |
+# DEFINE_set | apreq_xs_table_param_set |
+# DEFINE_STORE | apreq_xs_table_param_set |
+# DEFINE_add | apreq_xs_table_param_add |
+# DEFINE_new | apreq_xs_table_request_make |
+# DEFINE_NEXTKEY | apreq_xs_table_NEXTKEY |
+# DEFINE_FIRSTKEY | apreq_xs_table_NEXTKEY |
+# DEFINE_do | apreq_xs_table_do |
########## Apache::Upload:: Functions ##########
-MODULE=Apache::Upload PACKAGE=Apache::Upload PREFIX=Apache__Upload_
- const char *:DEFINE_name | apreq_param_name(apreq_xs_sv2param(sv)) |
SV *:sv
- char *:DEFINE_filename | apreq_param_value(apreq_xs_sv2param(sv)) |
SV *:sv
- DEFINE_env | apreq_xs_upload_env |
- DEFINE_link | apreq_xs_upload_link |
- DEFINE_slurp | apreq_xs_upload_slurp |
- DEFINE_size | apreq_xs_upload_size |
- DEFINE_type | apreq_xs_upload_type |
- DEFINE_tempname | apreq_xs_upload_tempname |
- DEFINE_make | apreq_xs_upload_make |
-
-MODULE=Apache::Upload PACKAGE=Apache::Upload::Table
PREFIX=Apache__Upload__Table_
- DEFINE_get | apreq_xs_upload_table_get |
- DEFINE_FETCH | apreq_xs_upload_table_FETCH |
- DEFINE_set | apreq_xs_table_param_set |
- DEFINE_STORE | apreq_xs_table_param_set |
- DEFINE_add | apreq_xs_table_param_add |
- DEFINE_new | apreq_xs_table_request_make |
- DEFINE_NEXTKEY | apreq_xs_upload_table_NEXTKEY |
- DEFINE_FIRSTKEY | apreq_xs_upload_table_NEXTKEY |
- DEFINE_do | apreq_xs_upload_table_do |
-
-MODULE=Apache::Upload PACKAGE=Apache::Request PREFIX=Apache__Request_
- DEFINE_upload | apreq_xs_request_upload_get |
-
-MODULE=Apache::Upload PACKAGE=Apache::Upload::Brigade
PREFIX=Apache__Upload__Brigade_
- DEFINE_new | apreq_xs_upload_brigade_copy |
- DEFINE_TIEHANDLE | apreq_xs_upload_brigade_copy |
- DEFINE_READ | apreq_xs_upload_brigade_read |
- DEFINE_READLINE | apreq_xs_upload_brigade_readline |
-
-MODULE=Apache::Upload PACKAGE=Apache::Upload::IO PREFIX=Apache__Upload__IO_
- DEFINE_read | apreq_xs_upload_brigade_read |
- DEFINE_readline | apreq_xs_upload_brigade_readline |
+#MODULE=Apache::Upload PACKAGE=Apache::Upload PREFIX=Apache__Upload_
+# const char *:DEFINE_name | apreq_param_name(apreq_xs_sv2param(sv)) |
SV *:sv
+# char *:DEFINE_filename | apreq_param_value(apreq_xs_sv2param(sv)) |
SV *:sv
+# DEFINE_env | apreq_xs_upload_env |
+# DEFINE_link | apreq_xs_upload_link |
+# DEFINE_slurp | apreq_xs_upload_slurp |
+# DEFINE_size | apreq_xs_upload_size |
+# DEFINE_type | apreq_xs_upload_type |
+# DEFINE_tempname | apreq_xs_upload_tempname |
+# DEFINE_make | apreq_xs_upload_make |
+
+#MODULE=Apache::Upload PACKAGE=Apache::Upload::Table
PREFIX=Apache__Upload__Table_
+# DEFINE_get | apreq_xs_upload_table_get |
+# DEFINE_FETCH | apreq_xs_upload_table_FETCH |
+# DEFINE_set | apreq_xs_table_param_set |
+# DEFINE_STORE | apreq_xs_table_param_set |
+# DEFINE_add | apreq_xs_table_param_add |
+# DEFINE_new | apreq_xs_table_request_make |
+# DEFINE_NEXTKEY | apreq_xs_upload_table_NEXTKEY |
+# DEFINE_FIRSTKEY | apreq_xs_upload_table_NEXTKEY |
+# DEFINE_do | apreq_xs_upload_table_do |
+
+#MODULE=Apache::Upload PACKAGE=Apache::Request PREFIX=Apache__Request_
+# DEFINE_upload | apreq_xs_request_upload_get |
+
+#MODULE=Apache::Upload PACKAGE=Apache::Upload::Brigade
PREFIX=Apache__Upload__Brigade_
+# DEFINE_new | apreq_xs_upload_brigade_copy |
+# DEFINE_TIEHANDLE | apreq_xs_upload_brigade_copy |
+# DEFINE_READ | apreq_xs_upload_brigade_read |
+# DEFINE_READLINE | apreq_xs_upload_brigade_readline |
+
+#MODULE=Apache::Upload PACKAGE=Apache::Upload::IO PREFIX=Apache__Upload__IO_
+# DEFINE_read | apreq_xs_upload_brigade_read |
+# DEFINE_readline | apreq_xs_upload_brigade_readline |
########## Apache::Cookie:: Functions ##########
-MODULE=Apache::Cookie PACKAGE=Apache::Cookie
- DEFINE_as_string | apreq_xs_cookie_as_string |
- DEFINE_make | apreq_xs_make_cookie |
- DEFINE_expires | apreq_xs_cookie_expires |
- DEFINE_set_attr | apreq_xs_cookie_set_attr |
- DEFINE_env | apreq_xs_cookie_env |
- DEFINE_encode | apreq_xs_encode |
- DEFINE_decode | apreq_xs_decode |
- const char *:DEFINE_name | apreq_cookie_name(c) | apreq_cookie_t *:c
- const char *:DEFINE_raw_value| apreq_cookie_value(c) | apreq_cookie_t *:c
- apr_status_t:DEFINE_bake | apreq_cookie_bake (apreq_xs_sv2cookie(c),
apreq_xs_sv2env(SvRV(c))) | SV *:c
- apr_status_t:DEFINE_bake2| apreq_cookie_bake2(apreq_xs_sv2cookie(c),
apreq_xs_sv2env(SvRV(c))) | SV *:c
-
-MODULE=Apache::Cookie PACKAGE=Apache::Cookie::Jar PREFIX=Apache__Cookie__Jar_
- DEFINE_jar | apreq_xs_jar |
- DEFINE_env | apreq_xs_jar_env |
- DEFINE_cookies | apreq_xs_jar_get |
- DEFINE_get | apreq_xs_jar_get |
- DEFINE_config | apreq_xs_jar_config |
-
-MODULE=Apache::Cookie PACKAGE=Apache::Cookie::Table
PREFIX=Apache__Cookie__Table_
- DEFINE_get | apreq_xs_table_get |
- DEFINE_FETCH | apreq_xs_table_FETCH |
- DEFINE_set | apreq_xs_table_cookie_set |
- DEFINE_STORE | apreq_xs_table_cookie_set |
- DEFINE_add | apreq_xs_table_cookie_add |
- DEFINE_new | apreq_xs_table_jar_make |
- DEFINE_NEXTKEY | apreq_xs_table_NEXTKEY |
- DEFINE_FIRSTKEY | apreq_xs_table_NEXTKEY |
- DEFINE_do | apreq_xs_table_do |
+#MODULE=Apache::Cookie PACKAGE=Apache::Cookie
+# DEFINE_as_string | apreq_xs_cookie_as_string |
+# DEFINE_make | apreq_xs_make_cookie |
+# DEFINE_expires | apreq_xs_cookie_expires |
+# DEFINE_set_attr | apreq_xs_cookie_set_attr |
+# DEFINE_env | apreq_xs_cookie_env |
+# DEFINE_encode | apreq_xs_encode |
+# DEFINE_decode | apreq_xs_decode |
+# const char *:DEFINE_name | apreq_cookie_name(c) | apreq_cookie_t *:c
+# const char *:DEFINE_raw_value| apreq_cookie_value(c) | apreq_cookie_t *:c
+# apr_status_t:DEFINE_bake | apreq_cookie_bake (apreq_xs_sv2cookie(c),
apreq_xs_sv2env(SvRV(c))) | SV *:c
+# apr_status_t:DEFINE_bake2| apreq_cookie_bake2(apreq_xs_sv2cookie(c),
apreq_xs_sv2env(SvRV(c))) | SV *:c
+
+#MODULE=Apache::Cookie PACKAGE=Apache::Cookie::Jar PREFIX=Apache__Cookie__Jar_
+# DEFINE_jar | apreq_xs_jar |
+# DEFINE_env | apreq_xs_jar_env |
+# DEFINE_cookies | apreq_xs_jar_get |
+# DEFINE_get | apreq_xs_jar_get |
+# DEFINE_config | apreq_xs_jar_config |
+
+#MODULE=Apache::Cookie PACKAGE=Apache::Cookie::Table
PREFIX=Apache__Cookie__Table_
+# DEFINE_get | apreq_xs_table_get |
+# DEFINE_FETCH | apreq_xs_table_FETCH |
+# DEFINE_set | apreq_xs_table_cookie_set |
+# DEFINE_STORE | apreq_xs_table_cookie_set |
+# DEFINE_add | apreq_xs_table_cookie_add |
+# DEFINE_new | apreq_xs_table_jar_make |
+# DEFINE_NEXTKEY | apreq_xs_table_NEXTKEY |
+# DEFINE_FIRSTKEY | apreq_xs_table_NEXTKEY |
+# DEFINE_do | apreq_xs_table_do |
########## Utility Functions ##########
@@ -103,8 +103,5 @@
# apreq_expires
-
-
-
-
-
+MODULE=APR::Request PACKAGE=APR::Request::Handle PREFIX=apreq_
+apreq_jar
Modified:
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/maps/apreq_structures.map
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/maps/apreq_structures.map?view=diff&r1=153703&r2=153704
==============================================================================
---
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/maps/apreq_structures.map
(original)
+++
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/maps/apreq_structures.map
Sun Feb 13 19:29:46 2005
@@ -7,23 +7,23 @@
# data[1]
#</apreq_value_t>
-<apreq_param_t MODULE=Apache::Upload>
+<apreq_param_t MODULE=APR::Request::Param>
info
- bb
+ upload
! v
</apreq_param_t>
-<apreq_request_t MODULE=Apache::Request>
-! args
-! body
-! parser
-! cfg
-! env
- args_status
- body_status
-</apreq_request_t>
+#<apreq_handle_t MODULE=APR::Request::Handle>
+#! args
+#! body
+#! parser
+#! cfg
+#! env
+# args_status
+# body_status
+#</apreq_handle_t>
-<apreq_cookie_t MODULE=Apache::Cookie>
+<apreq_cookie_t MODULE=APR::Request::Cookie>
version
path
domain
@@ -35,21 +35,13 @@
! v
</apreq_cookie_t>
-<apreq_jar_t MODULE=Apache::Cookie>
-! cookies
-! env
- status
-</apreq_jar_t>
-
-
-
-<apreq_hook_t MODULE=Apache::Request>
+<apreq_hook_t MODULE=APR::Request::Hook>
! hook
! next
! ctx
</apreq_hook_t>
-<apreq_parser_t MODULE=Apache::Request>
+<apreq_parser_t MODULE=Apache::Request::Parser>
! parser
! content_type
! hook
Modified:
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/maps/apreq_types.map
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/maps/apreq_types.map?view=diff&r1=153703&r2=153704
==============================================================================
---
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/maps/apreq_types.map
(original)
+++
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/maps/apreq_types.map
Sun Feb 13 19:29:46 2005
@@ -9,7 +9,7 @@
void * | PTR
const void * | PTR
unsigned | UV
-apreq_cookie_version_t | APREQ_COOKIE_VERSION
+#apreq_cookie_version_t | APREQ_COOKIE_VERSION
#data structure stuff
struct apr_pool_t | APR::Pool | T_POOLOBJ
@@ -20,7 +20,6 @@
#struct apr_hash_t | APR::Hash
#apr_hash_index_t | APR::HashIndex
-struct apreq_param_t | Apache::Upload
-struct apreq_request_t | Apache::Request | T_APREQ_REQUEST
-struct apreq_jar_t | Apache::Cookie::Jar | T_APREQ_JAR
-struct apreq_cookie_t | Apache::Cookie
+struct apreq_param_t | APR::Request::Param
+struct apreq_cookie_t | APR::Request::Cookie
+struct apreq_handle_t | APR::Request::Handle
