← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ruby1.9.1/quantal

« back to all changes in this revision

Viewing changes to ext/psych/psych.c

  • Committer: Bazaar Package Importer
  • Author(s): Lucas Nussbaum
  • Date: 2010-07-31 17:08:39 UTC
  • mfrom: (1.1.4 upstream) (8.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20100731170839-j034dmpdqt1cc4p6
Tags: 1.9.2~svn28788-1
http://bugs.debian.org/580852
http://bugs.debian.org/590002
http://bugs.debian.org/543805
http://bugs.debian.org/542927
* New release based on upstream snapshot from the 1.9.2 branch,
  after 1.9.2 RC2. That branch is (supposed to be) binary-compatible
  with the 1.9.1 branch.
  + Builds fine on i386. Closes: #580852.
* Upgrade to Standards-Version: 3.9.1. No changes needed.
* Updated generated incs.
* Patches that still need work:
  + Unclear status, need more investigation:
   090729_fix_Makefile_deps.dpatch
   090803_exclude_rdoc.dpatch
   203_adjust_base_of_search_path.dpatch
   902_define_YAML_in_yaml_stringio.rb.dpatch
   919_common.mk_tweaks.dpatch
   931_libruby_suffix.dpatch
   940_test_thread_mutex_sync_shorter.dpatch
  + Maybe not needed anymore, keeping but not applying.
   102_skip_test_copy_stream.dpatch (test doesn't block anymore?)
   104_skip_btest_io.dpatch (test doesn't block anymore?)
   201_gem_prelude.dpatch (we don't use that rubygems anyway?)
   202_gem_default_dir.dpatch (we don't use that rubygems anyway?)
   940_test_file_exhaustive_fails_as_root.dpatch
   940_test_priority_fails.dpatch
   100518_load_libc_libm.dpatch
* Add disable-tests.diff: disable some tests that cause failures on FreeBSD.
  Closes: #590002, #543805, #542927.
* However, many new failures on FreeBSD. Since that version is still an
  improvement, add the check that makes test suite failures non-fatal on
  FreeBSD again. That still needs to be investigated.
* Re-add 903_skip_base_ruby_check.dpatch
* Add build-dependency on ruby1.8 and drop all pre-generated files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/psych/psych.c
 
1
#include <psych.h>
 
2
 
 
3
/* call-seq: Psych.libyaml_version
 
4
 *
 
5
 * Returns the version of libyaml being used
 
6
 */
 
7
static VALUE libyaml_version(VALUE module)
 
8
{
 
9
    int major, minor, patch;
 
10
    VALUE list[3];
 
11
 
 
12
    yaml_get_version(&major, &minor, &patch);
 
13
 
 
14
    list[0] = INT2NUM((long)major);
 
15
    list[1] = INT2NUM((long)minor);
 
16
    list[2] = INT2NUM((long)patch);
 
17
 
 
18
    return rb_ary_new4((long)3, list);
 
19
}
 
20
 
 
21
VALUE mPsych;
 
22
 
 
23
void Init_psych()
 
24
{
 
25
    mPsych = rb_define_module("Psych");
 
26
 
 
27
    rb_define_singleton_method(mPsych, "libyaml_version", libyaml_version, 0);
 
28
 
 
29
    Init_psych_parser();
 
30
    Init_psych_emitter();
 
31
    Init_psych_to_ruby();
 
32
    Init_psych_yaml_tree();
 
33
}
 
34
/* vim: set noet sws=4 sw=4: */