fix merge

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)

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;
 

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);

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 )