Contribs: fix orc stdint weird inclusions in 0.4.14

Should fix wiN32 contribs

diff --git a/extras/contrib/src/Patches/orc-stdint.patch b/extras/contrib/src/Patches/orc-stdint.patch
new file mode 100644 (file)
index 0000000..4f97829
--- /dev/null
+++ b/extras/contrib/src/Patches/orc-stdint.patch
@@ -0,0 +1,30 @@
+--- orc/orc/orc.h      2011-04-14 21:07:08.000000000 +0200
++++ orc.new/orc/orc.h  2011-05-08 19:03:51.294908858 +0200
+@@ -2,6 +2,7 @@
+ #ifndef _ORC_ORC_H_
+ #define _ORC_ORC_H_
+ 
++#include <orc/orcutils.h>
+ #include <orc/orcprogram.h>
+ #include <orc/orc-stdint.h>
+ #include <orc/orcarm.h>
+@@ -12,7 +13,6 @@
+ #include <orc/orcparse.h>
+ #include <orc/orcprogram.h>
+ #include <orc/orcsse.h>
+-#include <orc/orcutils.h>
+ #include <orc/orcx86.h>
+ #include <orc/orcpowerpc.h>
+ 
+--- orc/orc/orcutils.h 2011-04-28 00:29:24.000000000 +0200
++++ orc.new/orc/orcutils.h     2011-05-08 19:10:13.380803529 +0200
+@@ -30,8 +30,8 @@
+ 
+ #ifndef _ORC_INTEGER_TYPEDEFS_
+ #define _ORC_INTEGER_TYPEDEFS_
+-#if defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L
+ #include <stdint.h>
++#if defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L
+ typedef int8_t orc_int8;
+ typedef int16_t orc_int16;
+ typedef int32_t orc_int32;

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index a3a63bf4e7c03e912131ec1dc24a3cfc57568df7..98677615ec9d405d405f29b52ac6cb902ac7c392 100644 (file)
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -2374,6 +2374,7 @@ orc-$(ORC_VERSION).tar.gz:
 
 orc: orc-$(ORC_VERSION).tar.gz
        $(EXTRACT_GZ)
+       patch -p0 < Patches/orc-stdint.patch
 
 .orc: orc
 ifdef HAVE_MACOSX