diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-15 04:30:37 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-15 04:30:37 +0000 |
| commit | b6c604d757d67085c5b2cfb7e38ebebfa6d9aa63 (patch) | |
| tree | a0014d723211d76cff25ddfbafbbfa61d04a98c0 | |
| parent | 72282ab1e2a9c85b0c38e1e78c50fe8ea2f138ed (diff) | |
| download | ruby-b6c604d757d67085c5b2cfb7e38ebebfa6d9aa63.tar.gz | |
* ext/zlib/zlib.c (Init_zlib): Added Zlib::TEXT and note that
Zlib::ASCII is deprecated in zlib 1.2.3 and newer.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34622 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 10 |
2 files changed, 15 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Wed Feb 15 12:30:10 2012 Eric Hodel <drbrain@segment7.net> + + * ext/zlib/zlib.c (Init_zlib): Added Zlib::TEXT and note that + Zlib::ASCII is deprecated in zlib 1.2.3 and newer. + Wed Feb 15 12:24:40 2012 Eric Hodel <drbrain@segment7.net> * ext/zlib/zlib.c: Move constant descriptions to constants. Remove diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 53389ab7a7..82a198f19f 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -4057,9 +4057,19 @@ Init_zlib() /* Represents text data as guessed by deflate. * + * NOTE: The underlying constant Z_ASCII was deprecated in favor of Z_TEXT + * in zlib 1.2.2. New applications should not use this constant. + * * See Zlib::Deflate#data_type. */ rb_define_const(mZlib, "ASCII", INT2FIX(Z_ASCII)); +#ifdef Z_TEXT + /* Represents text data as guessed by deflate. + * + * See Zlib::Deflate#data_type. */ + rb_define_const(mZlib, "TEXT", INT2FIX(Z_TEXT)); +#endif + /* Represents an unknown data type as guessed by deflate. * * See Zlib::Deflate#data_type. */ |