From 5c3211bb22a3cbce2f206381d8ed8a7010d72e7c Mon Sep 17 00:00:00 2001 From: pixdamix Date: Tue, 1 Dec 2009 08:02:59 +0000 Subject: [PATCH] patch for opkg_download.c compile abort Fix problem wich may lead to FALSE and TRUE being redefined. Thanks to John L. for reporting this problem git-svn-id: http://opkg.googlecode.com/svn/trunk@413 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358 --- libbb/libbb.h | 5 +++++ libopkg/opkg_download.c | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/libbb/libbb.h b/libbb/libbb.h index 17f3c25..619b400 100644 --- a/libbb/libbb.h +++ b/libbb/libbb.h @@ -29,8 +29,13 @@ #include +#ifndef FALSE #define FALSE ((int) 0) +#endif + +#ifndef TRUE #define TRUE ((int) 1) +#endif extern void error_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2))); extern void error_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2))); diff --git a/libopkg/opkg_download.c b/libopkg/opkg_download.c index 0cc3da2..c4b2f0c 100644 --- a/libopkg/opkg_download.c +++ b/libopkg/opkg_download.c @@ -18,6 +18,16 @@ */ #include "config.h" +#include "includes.h" +#include "opkg_download.h" +#include "opkg_message.h" + +#include "sprintf_alloc.h" +#include "xsystem.h" +#include "file_util.h" +#include "opkg_defines.h" +#include "libbb/libbb.h" + #ifdef HAVE_CURL #include #endif @@ -39,16 +49,6 @@ #include #endif -#include "includes.h" -#include "opkg_download.h" -#include "opkg_message.h" - -#include "sprintf_alloc.h" -#include "xsystem.h" -#include "file_util.h" -#include "opkg_defines.h" -#include "libbb/libbb.h" - #ifdef HAVE_PATHFINDER #include "opkg_pathfinder.h" #endif -- 2.25.1