From ee026c8b70f37ea85769f359997788cd8ae08f2b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 20 Mar 2016 13:09:19 -0300
Subject: [PATCH] fix merge

---
 crypto777/bitcoind_RPC.c | 7 +++++--
 crypto777/cJSON.c        | 6 +++---
 crypto777/inet.c         | 6 ++----
 iguana/iguana_bundles.c  | 2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/crypto777/bitcoind_RPC.c b/crypto777/bitcoind_RPC.c
index d1c878e13..2de139073 100755
--- a/crypto777/bitcoind_RPC.c
+++ b/crypto777/bitcoind_RPC.c
@@ -14,10 +14,13 @@
  ******************************************************************************/
 
 #include "OS_portable.h"
-//#include "../includes/cJSON.h"
-
+#ifdef _WIN32
 #include <curl.h>
 #include <easy.h>
+#else
+#include <curl/curl.h>
+#include <curl/easy.h>
+#endif
 
 // return data from the server
 #define CURL_GLOBAL_ALL (CURL_GLOBAL_SSL|CURL_GLOBAL_WIN32)
diff --git a/crypto777/cJSON.c b/crypto777/cJSON.c
index 0978af460..c7ce836c0 100755
--- a/crypto777/cJSON.c
+++ b/crypto777/cJSON.c
@@ -26,10 +26,10 @@
 #include <math.h>
 
 #include "../includes/cJSON.h"
-//#define DEFINES_ONLY
-//#include "../common/system777.c"
-//#undef DEFINES_ONLY
+
+#ifndef DBL_EPSILON
 #define DBL_EPSILON 2.2204460492503131E-16
+#endif
 
 static const char *ep;
 
diff --git a/crypto777/inet.c b/crypto777/inet.c
index 2057f90d3..757389a49 100755
--- a/crypto777/inet.c
+++ b/crypto777/inet.c
@@ -19,12 +19,8 @@
 #ifndef crypto777_inet_h
 #define crypto777_inet_h
 #include "OS_portable.h"
-//#include <in.h>
 
 #ifdef _WIN32
-//#include <windows.h>
-//#include <io.h>
-//#include <winsock2.h>
 #define in6_addr sockaddr
 #define in_addr_t struct sockaddr_storage
 #define EAFNOSUPPORT WSAEAFNOSUPPORT
@@ -37,7 +33,9 @@ struct sockaddr_in6 {
     u_long  sin6_scope_id;
 };
 #endif
+#ifndef AF_INET6
 #define AF_INET6	23
+#endif
 static int inet_ntop4(unsigned char *src, char *dst, size_t size);
 static int inet_ntop6(unsigned char *src, char *dst, size_t size);
 static int inet_pton4(char *src, unsigned char *dst);
diff --git a/iguana/iguana_bundles.c b/iguana/iguana_bundles.c
index 512df107e..b64b8183d 100755
--- a/iguana/iguana_bundles.c
+++ b/iguana/iguana_bundles.c
@@ -622,7 +622,7 @@ int64_t iguana_bundlecalcs(struct iguana_info *coin,struct iguana_bundle *bp)
                     printf("iguana_bundlecalcs.(%s) illegal hdrsi.%d bundlei.%d checki.%d\n",fname,hdrsi,bundlei,checki);
                     continue;
                 }
-                if ( 1 && bp->checkedtmp < bp->n && (fp= fopen(fname,"rb")) != 0 )
+                if ( 0 && bp->checkedtmp < bp->n && (fp= fopen(fname,"rb")) != 0 )
                 {
                     fseek(fp,0,SEEK_END);
                     if ( block->RO.recvlen == 0 )