diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2005-10-10 17:28:31 +0300 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2005-10-10 11:22:08 +0000 |
| commit | 0added8b15cac1ea71069426f604832d35edbd96 (patch) | |
| tree | 94ed12998ad8294974c52ac12a469d6bc7bbae88 /ext | |
| parent | d13b0db44cac76f0adf0e6c3d90ab2721e4b6521 (diff) | |
| download | perl-0added8b15cac1ea71069426f604832d35edbd96.tar.gz | |
Symbian bleadperl@25725 update
Message-ID: <B356D8F434D20B40A8CEDAEC305A1F24E7A5C4@esebe105.NOE.Nokia.com>
p4raw-id: //depot/perl@25730
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/Compress/Zlib/Zlib.xs | 1 | ||||
| -rw-r--r-- | ext/Compress/Zlib/zlib-src/trees.c | 18 |
2 files changed, 16 insertions, 3 deletions
diff --git a/ext/Compress/Zlib/Zlib.xs b/ext/Compress/Zlib/Zlib.xs index 19b5b6b000..cace39b8fb 100644 --- a/ext/Compress/Zlib/Zlib.xs +++ b/ext/Compress/Zlib/Zlib.xs @@ -634,6 +634,7 @@ SV * sv ; char * string ; #endif { + dTHX; bool wipe = 0 ; SvGETMAGIC(sv); diff --git a/ext/Compress/Zlib/zlib-src/trees.c b/ext/Compress/Zlib/zlib-src/trees.c index 395e4e1681..b7be30ecfc 100644 --- a/ext/Compress/Zlib/zlib-src/trees.c +++ b/ext/Compress/Zlib/zlib-src/trees.c @@ -126,13 +126,23 @@ struct static_tree_desc_s { int max_length; /* max bit length for the codes */ }; -local static_tree_desc static_l_desc = +#if defined(__SYMBIAN32__) +# define NO_WRITEABLE_DATA +#endif + +#ifdef NO_WRITEABLE_DATA +# define DEFINE_LOCAL_STATIC const local +#else /* #ifdef NO_WRITEABLE_DATA */ +# define DEFINE_LOCAL_STATIC local +#endif /* #ifdef NO_WRITEABLE_DATA */ + +DEFINE_LOCAL_STATIC static_tree_desc static_l_desc = {static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS}; -local static_tree_desc static_d_desc = +DEFINE_LOCAL_STATIC static_tree_desc static_d_desc = {static_dtree, extra_dbits, 0, D_CODES, MAX_BITS}; -local static_tree_desc static_bl_desc = +DEFINE_LOCAL_STATIC static_tree_desc static_bl_desc = {(const ct_data *)0, extra_blbits, 0, BL_CODES, MAX_BL_BITS}; /* =========================================================================== @@ -249,12 +259,14 @@ local void tr_static_init() if (static_init_done) return; +#ifndef NO_WRITEABLE_DATA /* For some embedded targets, global variables are not initialized: */ static_l_desc.static_tree = static_ltree; static_l_desc.extra_bits = extra_lbits; static_d_desc.static_tree = static_dtree; static_d_desc.extra_bits = extra_dbits; static_bl_desc.extra_bits = extra_blbits; +#endif /* #ifndef NO_WRITEABLE_DATA */ /* Initialize the mapping length (0..255) -> length code (0..28) */ length = 0; |