yaml/yaml.patch

changeset 591
f65313225f8a
parent 356
14df3eec63f9
equal deleted inserted replaced
0:08a117a64cb6 1:4cc518507b03
1 Index: YAML-AppConfig-0.16/Makefile.PL 1 Index: YAML-AppConfig-0.16/Makefile.PL
2 --- YAML-AppConfig-0.16/Makefile.PL.orig 2006-07-02 23:21:51 +0200 2 --- YAML-AppConfig-0.16/Makefile.PL.orig 2006-07-02 23:21:51.000000000 +0200
3 +++ YAML-AppConfig-0.16/Makefile.PL 2009-11-27 13:24:07 +0100 3 +++ YAML-AppConfig-0.16/Makefile.PL 2012-07-31 16:07:20.000000000 +0200
4 @@ -21,6 +21,7 @@ 4 @@ -21,6 +21,7 @@
5 eval "require $info->[0]; 0;"; 5 eval "require $info->[0]; 0;";
6 push @yamls, @$info unless $@; 6 push @yamls, @$info unless $@;
7 } 7 }
8 - die "YAML >= 0.38 or YAML::Syck >= 0 required.\n" unless @yamls; 8 - die "YAML >= 0.38 or YAML::Syck >= 0 required.\n" unless @yamls;
9 + # die "YAML >= 0.38 or YAML::Syck >= 0 required.\n" unless @yamls; 9 + # die "YAML >= 0.38 or YAML::Syck >= 0 required.\n" unless @yamls;
10 return @yamls; 10 return @yamls;
11 } 11 }
12 + 12 +
13 Index: syck-0.70/lib/bytecode.c 13 Index: syck-0.70/lib/bytecode.c
14 --- syck-0.70/lib/bytecode.c.orig 2009-09-30 19:29:34 +0200 14 --- syck-0.70/lib/bytecode.c.orig 2009-09-30 19:29:34.000000000 +0200
15 +++ syck-0.70/lib/bytecode.c 2009-11-27 13:24:07 +0100 15 +++ syck-0.70/lib/bytecode.c 2012-07-31 16:10:17.000000000 +0200
16 @@ -7,6 +7,10 @@ 16 @@ -7,11 +7,16 @@
17 * 17 *
18 * Copyright (C) 2003 why the lucky stiff 18 * Copyright (C) 2003 why the lucky stiff
19 */ 19 */
20 + 20 +
21 +#include <stdlib.h> 21 +#include <stdlib.h>
22 +#include <string.h> 22 +#include <string.h>
23 + 23 +
24 #include "syck.h" 24 #include "syck.h"
25 25
26 #if GRAM_FILES_HAVE_TAB_SUFFIX 26 #if GRAM_FILES_HAVE_TAB_SUFFIX
27 #include "gram.tab.h"
28 #else
29 +#define YYPARSE_PARAM
30 #include "gram.h"
31 #endif
32
33 Index: syck-0.70/lib/gram.y
34 --- syck-0.70/lib/gram.y.orig 2009-09-30 19:29:34.000000000 +0200
35 +++ syck-0.70/lib/gram.y 2012-07-31 16:09:51.000000000 +0200
36 @@ -19,14 +19,14 @@
37 #define YYSTACK_USE_ALLOCA 0
38 #endif
39
40 +#define YYPARSE_PARAM parser
41 +#define YYLEX_PARAM parser
42 +
43 #include "syck.h"
44 #include "sycklex.h"
45
46 void apply_seq_in_map( SyckParser *parser, SyckNode *n );
47
48 -#define YYPARSE_PARAM parser
49 -#define YYLEX_PARAM parser
50 -
51 #define NULL_NODE(parser, node) \
52 SyckNode *node = syck_new_str( "", scalar_plain ); \
53 if ( ((SyckParser *)parser)->taguri_expansion == 1 ) \
27 Index: syck-0.70/lib/handler.c 54 Index: syck-0.70/lib/handler.c
28 --- syck-0.70/lib/handler.c.orig 2009-09-30 19:29:34 +0200 55 --- syck-0.70/lib/handler.c.orig 2009-09-30 19:29:34.000000000 +0200
29 +++ syck-0.70/lib/handler.c 2009-11-27 13:24:07 +0100 56 +++ syck-0.70/lib/handler.c 2012-07-31 16:07:20.000000000 +0200
30 @@ -7,6 +7,9 @@ 57 @@ -7,6 +7,9 @@
31 * Copyright (C) 2003 why the lucky stiff 58 * Copyright (C) 2003 why the lucky stiff
32 */ 59 */
33 60
34 +#include <stdlib.h> 61 +#include <stdlib.h>
36 + 63 +
37 #include "syck.h" 64 #include "syck.h"
38 65
39 SYMID 66 SYMID
40 Index: syck-0.70/lib/implicit.c 67 Index: syck-0.70/lib/implicit.c
41 --- syck-0.70/lib/implicit.c.orig 2009-09-30 19:29:34 +0200 68 --- syck-0.70/lib/implicit.c.orig 2009-09-30 19:29:34.000000000 +0200
42 +++ syck-0.70/lib/implicit.c 2009-11-27 13:24:07 +0100 69 +++ syck-0.70/lib/implicit.c 2012-07-31 16:07:20.000000000 +0200
43 @@ -8,6 +8,7 @@ 70 @@ -8,6 +8,7 @@
44 * Copyright (C) 2003 why the lucky stiff 71 * Copyright (C) 2003 why the lucky stiff
45 */ 72 */
46 73
47 +#include <stdlib.h> 74 +#include <stdlib.h>
48 #include "syck.h" 75 #include "syck.h"
49 76
50 #define YYCTYPE char 77 #define YYCTYPE char
51 Index: syck-0.70/lib/node.c 78 Index: syck-0.70/lib/node.c
52 --- syck-0.70/lib/node.c.orig 2009-09-30 19:29:34 +0200 79 --- syck-0.70/lib/node.c.orig 2009-09-30 19:29:34.000000000 +0200
53 +++ syck-0.70/lib/node.c 2009-11-27 13:24:07 +0100 80 +++ syck-0.70/lib/node.c 2012-07-31 16:07:20.000000000 +0200
54 @@ -7,6 +7,9 @@ 81 @@ -7,6 +7,9 @@
55 * Copyright (C) 2003 why the lucky stiff 82 * Copyright (C) 2003 why the lucky stiff
56 */ 83 */
57 84
58 +#include <stdlib.h> 85 +#include <stdlib.h>
60 + 87 +
61 #include "syck.h" 88 #include "syck.h"
62 89
63 /* 90 /*
64 Index: syck-0.70/lib/syck.c 91 Index: syck-0.70/lib/syck.c
65 --- syck-0.70/lib/syck.c.orig 2009-09-30 19:29:34 +0200 92 --- syck-0.70/lib/syck.c.orig 2009-09-30 19:29:34.000000000 +0200
66 +++ syck-0.70/lib/syck.c 2009-11-27 13:24:07 +0100 93 +++ syck-0.70/lib/syck.c 2012-07-31 16:07:20.000000000 +0200
67 @@ -7,6 +7,7 @@ 94 @@ -7,6 +7,7 @@
68 * Copyright (C) 2003 why the lucky stiff 95 * Copyright (C) 2003 why the lucky stiff
69 */ 96 */
70 #include <stdio.h> 97 #include <stdio.h>
71 +#include <stdlib.h> 98 +#include <stdlib.h>
87 + str->ptr += max_size; 114 + str->ptr += max_size;
88 if ( str->ptr > str->end ) 115 if ( str->ptr > str->end )
89 { 116 {
90 str->ptr = str->end; 117 str->ptr = str->end;
91 Index: syck-0.70/lib/syck.h 118 Index: syck-0.70/lib/syck.h
92 --- syck-0.70/lib/syck.h.orig 2009-09-30 19:29:34 +0200 119 --- syck-0.70/lib/syck.h.orig 2009-09-30 19:29:34.000000000 +0200
93 +++ syck-0.70/lib/syck.h 2009-11-27 13:24:07 +0100 120 +++ syck-0.70/lib/syck.h 2012-07-31 16:07:20.000000000 +0200
94 @@ -36,6 +36,8 @@ 121 @@ -36,6 +36,8 @@
95 122
96 #include <stddef.h> 123 #include <stddef.h>
97 #include <stdio.h> 124 #include <stdio.h>
98 +#include <stdlib.h> 125 +#include <stdlib.h>
99 +#include <string.h> 126 +#include <string.h>
100 #include <ctype.h> 127 #include <ctype.h>
101 #ifdef HAVE_ST_H 128 #ifdef HAVE_ST_H
102 #include <st.h> 129 #include <st.h>
103 Index: syck-0.70/lib/token.c 130 Index: syck-0.70/lib/token.c
104 --- syck-0.70/lib/token.c.orig 2009-09-30 19:29:34 +0200 131 --- syck-0.70/lib/token.c.orig 2009-09-30 19:29:34.000000000 +0200
105 +++ syck-0.70/lib/token.c 2009-11-27 13:24:07 +0100 132 +++ syck-0.70/lib/token.c 2012-07-31 16:10:37.000000000 +0200
106 @@ -7,6 +7,8 @@ 133 @@ -7,11 +7,14 @@
107 * 134 *
108 * Copyright (C) 2003 why the lucky stiff 135 * Copyright (C) 2003 why the lucky stiff
109 */ 136 */
110 +#include <stdlib.h> 137 +#include <stdlib.h>
111 +#include <string.h> 138 +#include <string.h>
112 #include "syck.h" 139 #include "syck.h"
113 140
114 #if GRAM_FILES_HAVE_TAB_SUFFIX 141 #if GRAM_FILES_HAVE_TAB_SUFFIX
142 #include "gram.tab.h"
143 #else
144 +#define YYPARSE_PARAM
145 #include "gram.h"
146 #endif
147
115 Index: syck-0.70/lib/yaml2byte.c 148 Index: syck-0.70/lib/yaml2byte.c
116 --- syck-0.70/lib/yaml2byte.c.orig 2009-09-30 19:29:34 +0200 149 --- syck-0.70/lib/yaml2byte.c.orig 2009-09-30 19:29:34.000000000 +0200
117 +++ syck-0.70/lib/yaml2byte.c 2009-11-27 13:24:31 +0100 150 +++ syck-0.70/lib/yaml2byte.c 2012-07-31 16:07:20.000000000 +0200
118 @@ -11,6 +11,8 @@ 151 @@ -11,6 +11,8 @@
119 */ 152 */
120 #include "syck.h" 153 #include "syck.h"
121 #include <assert.h> 154 #include <assert.h>
122 +#include <stdlib.h> 155 +#include <stdlib.h>

mercurial