diff options
| author | Charles Oliver Nutter <headius@headius.com> | 2015-01-09 10:06:51 -0600 |
|---|---|---|
| committer | Charles Oliver Nutter <headius@headius.com> | 2015-01-09 10:06:51 -0600 |
| commit | 3ddffabc91bee3ba136a9367f24083b6bf9fd7ef (patch) | |
| tree | e73ce4213df554530b1088bc9d082b62f46f2862 /ext/psych/psych.h | |
| parent | ea50d0179c51d271c9fead299e9bf6dd06fe9689 (diff) | |
| parent | 24055a152492123b7516e9b4e54af5710ffed247 (diff) | |
| download | psych-3ddffabc91bee3ba136a9367f24083b6bf9fd7ef.tar.gz | |
Merge remote-tracking branch 'origin/master' into jruby
Conflicts:
.gitignore
Diffstat (limited to 'ext/psych/psych.h')
| -rw-r--r-- | ext/psych/psych.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/psych/psych.h b/ext/psych/psych.h index 9f1be44..1830ca4 100644 --- a/ext/psych/psych.h +++ b/ext/psych/psych.h @@ -9,10 +9,10 @@ #include <yaml.h> -#include <parser.h> -#include <emitter.h> -#include <to_ruby.h> -#include <yaml_tree.h> +#include <psych_parser.h> +#include <psych_emitter.h> +#include <psych_to_ruby.h> +#include <psych_yaml_tree.h> extern VALUE mPsych; |