From: Ales Kozumplik Date: Mon, 23 Jul 2012 08:44:24 +0000 (+0200) Subject: solv.i: new perl includes and the custom typedefs cause gcc errors. X-Git-Tag: BASE-SuSE-Code-12_3-Branch~240 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c9d3eb4abb769c796e55e5ad1e47c6acde63001;p=thirdparty%2Flibsolv.git solv.i: new perl includes and the custom typedefs cause gcc errors. Use as the default instead. Additionally this also causes all functions with return type 'bool' in solv.i having their return value converted into 1 or 0[1]. [1] C99 Draft, 6.3.1.2 --- diff --git a/bindings/solv.i b/bindings/solv.i index a5b9552f..618401cb 100644 --- a/bindings/solv.i +++ b/bindings/solv.i @@ -331,6 +331,7 @@ typedef VALUE AppObjectPtr; %include "typemaps.i" %{ +#include #include #include #include @@ -378,9 +379,6 @@ typedef VALUE AppObjectPtr; #define RARRAY_LEN(ary) (RARRAY(ary)->len) #endif -#define true 1 -#define false 1 - #define SOLVER_SOLUTION_ERASE -100 #define SOLVER_SOLUTION_REPLACE -101 #define SOLVER_SOLUTION_REPLACE_DOWNGRADE -102 @@ -388,7 +386,6 @@ typedef VALUE AppObjectPtr; #define SOLVER_SOLUTION_REPLACE_VENDORCHANGE -104 typedef struct chksum Chksum; -typedef int bool; typedef void *AppObjectPtr; typedef struct {