yaml/yaml.patch

changeset 592
d869aafb6416
parent 591
f65313225f8a
child 593
6a0daac879c0
     1.1 --- a/yaml/yaml.patch	Tue Aug 28 18:50:10 2012 +0200
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,159 +0,0 @@
     1.4 -Index: YAML-AppConfig-0.16/Makefile.PL
     1.5 ---- YAML-AppConfig-0.16/Makefile.PL.orig	2006-07-02 23:21:51.000000000 +0200
     1.6 -+++ YAML-AppConfig-0.16/Makefile.PL	2012-07-31 16:07:20.000000000 +0200
     1.7 -@@ -21,6 +21,7 @@
     1.8 -         eval "require $info->[0]; 0;";
     1.9 -         push @yamls, @$info unless $@;
    1.10 -     }
    1.11 --    die "YAML >= 0.38 or YAML::Syck >= 0 required.\n" unless @yamls;
    1.12 -+    # die "YAML >= 0.38 or YAML::Syck >= 0 required.\n" unless @yamls;
    1.13 -     return @yamls;
    1.14 - }
    1.15 -+
    1.16 -Index: syck-0.70/lib/bytecode.c
    1.17 ---- syck-0.70/lib/bytecode.c.orig	2009-09-30 19:29:34.000000000 +0200
    1.18 -+++ syck-0.70/lib/bytecode.c	2012-07-31 16:10:17.000000000 +0200
    1.19 -@@ -7,11 +7,16 @@
    1.20 -  *
    1.21 -  * Copyright (C) 2003 why the lucky stiff
    1.22 -  */
    1.23 -+
    1.24 -+#include <stdlib.h>
    1.25 -+#include <string.h>
    1.26 -+
    1.27 - #include "syck.h"
    1.28 - 
    1.29 - #if GRAM_FILES_HAVE_TAB_SUFFIX
    1.30 - #include "gram.tab.h"
    1.31 - #else
    1.32 -+#define YYPARSE_PARAM
    1.33 - #include "gram.h"
    1.34 - #endif
    1.35 - 
    1.36 -Index: syck-0.70/lib/gram.y
    1.37 ---- syck-0.70/lib/gram.y.orig	2009-09-30 19:29:34.000000000 +0200
    1.38 -+++ syck-0.70/lib/gram.y	2012-07-31 16:09:51.000000000 +0200
    1.39 -@@ -19,14 +19,14 @@
    1.40 - #define YYSTACK_USE_ALLOCA 0
    1.41 - #endif
    1.42 - 
    1.43 -+#define YYPARSE_PARAM   parser
    1.44 -+#define YYLEX_PARAM     parser
    1.45 -+
    1.46 - #include "syck.h"
    1.47 - #include "sycklex.h"
    1.48 - 
    1.49 - void apply_seq_in_map( SyckParser *parser, SyckNode *n );
    1.50 - 
    1.51 --#define YYPARSE_PARAM   parser
    1.52 --#define YYLEX_PARAM     parser
    1.53 --
    1.54 - #define NULL_NODE(parser, node) \
    1.55 -         SyckNode *node = syck_new_str( "", scalar_plain ); \
    1.56 -         if ( ((SyckParser *)parser)->taguri_expansion == 1 ) \
    1.57 -Index: syck-0.70/lib/handler.c
    1.58 ---- syck-0.70/lib/handler.c.orig	2009-09-30 19:29:34.000000000 +0200
    1.59 -+++ syck-0.70/lib/handler.c	2012-07-31 16:07:20.000000000 +0200
    1.60 -@@ -7,6 +7,9 @@
    1.61 -  * Copyright (C) 2003 why the lucky stiff
    1.62 -  */
    1.63 - 
    1.64 -+#include <stdlib.h>
    1.65 -+#include <string.h>
    1.66 -+
    1.67 - #include "syck.h"
    1.68 - 
    1.69 - SYMID 
    1.70 -Index: syck-0.70/lib/implicit.c
    1.71 ---- syck-0.70/lib/implicit.c.orig	2009-09-30 19:29:34.000000000 +0200
    1.72 -+++ syck-0.70/lib/implicit.c	2012-07-31 16:07:20.000000000 +0200
    1.73 -@@ -8,6 +8,7 @@
    1.74 -  * Copyright (C) 2003 why the lucky stiff
    1.75 -  */
    1.76 - 
    1.77 -+#include <stdlib.h>
    1.78 - #include "syck.h"
    1.79 - 
    1.80 - #define YYCTYPE     char
    1.81 -Index: syck-0.70/lib/node.c
    1.82 ---- syck-0.70/lib/node.c.orig	2009-09-30 19:29:34.000000000 +0200
    1.83 -+++ syck-0.70/lib/node.c	2012-07-31 16:07:20.000000000 +0200
    1.84 -@@ -7,6 +7,9 @@
    1.85 -  * Copyright (C) 2003 why the lucky stiff
    1.86 -  */
    1.87 - 
    1.88 -+#include <stdlib.h>
    1.89 -+#include <string.h>
    1.90 -+
    1.91 - #include "syck.h"
    1.92 - 
    1.93 - /*
    1.94 -Index: syck-0.70/lib/syck.c
    1.95 ---- syck-0.70/lib/syck.c.orig	2009-09-30 19:29:34.000000000 +0200
    1.96 -+++ syck-0.70/lib/syck.c	2012-07-31 16:07:20.000000000 +0200
    1.97 -@@ -7,6 +7,7 @@
    1.98 -  * Copyright (C) 2003 why the lucky stiff
    1.99 -  */
   1.100 - #include <stdio.h>
   1.101 -+#include <stdlib.h>
   1.102 - #include <string.h>
   1.103 - 
   1.104 - #include "syck.h"
   1.105 -@@ -67,12 +68,13 @@
   1.106 - 
   1.107 -     ASSERT( str != NULL );
   1.108 -     beg = str->ptr;
   1.109 -+
   1.110 -     if ( max_size >= 0 )
   1.111 -     {
   1.112 -         max_size -= skip;
   1.113 --        if ( max_size <= 0 )  max_size = 0;
   1.114 --        else                  str->ptr += max_size;
   1.115 -+        if ( max_size < 0 ) max_size = 0;
   1.116 - 
   1.117 -+        str->ptr += max_size;
   1.118 -         if ( str->ptr > str->end )
   1.119 -         {
   1.120 -             str->ptr = str->end;
   1.121 -Index: syck-0.70/lib/syck.h
   1.122 ---- syck-0.70/lib/syck.h.orig	2009-09-30 19:29:34.000000000 +0200
   1.123 -+++ syck-0.70/lib/syck.h	2012-07-31 16:07:20.000000000 +0200
   1.124 -@@ -36,6 +36,8 @@
   1.125 - 
   1.126 - #include <stddef.h>
   1.127 - #include <stdio.h>
   1.128 -+#include <stdlib.h>
   1.129 -+#include <string.h>
   1.130 - #include <ctype.h>
   1.131 - #ifdef HAVE_ST_H
   1.132 - #include <st.h>
   1.133 -Index: syck-0.70/lib/token.c
   1.134 ---- syck-0.70/lib/token.c.orig	2009-09-30 19:29:34.000000000 +0200
   1.135 -+++ syck-0.70/lib/token.c	2012-07-31 16:10:37.000000000 +0200
   1.136 -@@ -7,11 +7,14 @@
   1.137 -  *
   1.138 -  * Copyright (C) 2003 why the lucky stiff
   1.139 -  */
   1.140 -+#include <stdlib.h>
   1.141 -+#include <string.h>
   1.142 - #include "syck.h"
   1.143 - 
   1.144 - #if GRAM_FILES_HAVE_TAB_SUFFIX
   1.145 - #include "gram.tab.h"
   1.146 - #else
   1.147 -+#define YYPARSE_PARAM
   1.148 - #include "gram.h"
   1.149 - #endif
   1.150 - 
   1.151 -Index: syck-0.70/lib/yaml2byte.c
   1.152 ---- syck-0.70/lib/yaml2byte.c.orig	2009-09-30 19:29:34.000000000 +0200
   1.153 -+++ syck-0.70/lib/yaml2byte.c	2012-07-31 16:07:20.000000000 +0200
   1.154 -@@ -11,6 +11,8 @@
   1.155 -  */ 
   1.156 - #include "syck.h"
   1.157 - #include <assert.h>
   1.158 -+#include <stdlib.h>
   1.159 -+#include <string.h>
   1.160 - #define YAMLBYTE_UTF8
   1.161 - #include "yamlbyte.h"
   1.162 - 

mercurial