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

diff --git a/libbb/libbb.h b/libbb/libbb.h
index 17f3c25cf905ab581b72e2752bff1d5872dd2908..619b400d5fe3618fa1aa763cfad0d919769ec74a 100644 (file)
--- a/libbb/libbb.h
+++ b/libbb/libbb.h
@@ -29,8 +29,13 @@
 
 #include <features.h>
 
 
 #include <features.h>
 

+#ifndef FALSE

 #define FALSE   ((int) 0)
 #define FALSE   ((int) 0)

+#endif
+
+#ifndef TRUE

 #define TRUE    ((int) 1)
 #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)));
 
 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 0cc3da2071a577e45e48df5708a7ee14f09875df..c4b2f0cfff5b3702ddfd902e4301e044ad16e415 100644 (file)
--- a/libopkg/opkg_download.c
+++ b/libopkg/opkg_download.c
@@ -18,6 +18,16 @@
 */
 #include "config.h"
 
 */
 #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 <curl/curl.h>
 #endif
 #ifdef HAVE_CURL
 #include <curl/curl.h>
 #endif


@@ -39,16 +49,6 @@
 #include <openssl/hmac.h>
 #endif
 
 #include <openssl/hmac.h>
 #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
 #ifdef HAVE_PATHFINDER
 #include "opkg_pathfinder.h"
 #endif