pre merge

bitcoin/signature.h

@@ -3,6 +3,7 @@
 #include "config.h"
 #include <ccan/short_types/short_types.h>
 #include <stdbool.h>
+#include <stddef.h>
 
 struct sha256_double;
 struct bitcoin_tx;

btcnetwork/c/watch.c

@@ -1,4 +1,5 @@
 #include "watch.h"
+#include <string.h>
 
 void outsourcing_task_init(struct lnwatch_task* task, const struct sha256_double* commitid)
 {

ccan/ccan/opt/helpers.c

@@ -11,6 +11,11 @@
 #include "private.h"
 #include <float.h>
 
+#ifdef _MSC_VER
+#define strncasecmp _strnicmp
+#define strcasecmp _stricmp
+#endif
+
 /* Upper bound to sprintf this simple type?  Each 3 bits < 1 digit. */
 #define CHAR_SIZE(type) (((sizeof(type)*CHAR_BIT + 2) / 3) + 1)
 

libwally-core/src/cpufeatures/cpu-features.c

@@ -546,14 +546,16 @@ get_elf_hwcap_from_proc_self_auxv(void) {
     struct { uint32_t tag; uint32_t value; } entry;
     uint32_t result = 0;
     const char filepath[] = "/proc/self/auxv";
-    int fd = TEMP_FAILURE_RETRY(open(filepath, O_RDONLY));
+    /* int fd = TEMP_FAILURE_RETRY(open(filepath, O_RDONLY)); */
+    int fd = -1;
     if (fd < 0) {
         return 0;
     }
 
 
     for (;;) {
-        int ret = TEMP_FAILURE_RETRY(read(fd, (char*)&entry, sizeof entry));
+        /* int ret = TEMP_FAILURE_RETRY(read(fd, (char*)&entry, sizeof entry)); */
+        int ret = -1;
         if (ret < 0) {
             break;
         }

libwally-core/src/hmac.h

@@ -17,6 +17,10 @@ void hmac_sha256_internal(struct sha256 *sha,
                  const unsigned char *key, size_t key_len,
                  const unsigned char *msg, size_t msg_len);
 
+void hmac_sha256(struct sha256 *sha,
+                          const unsigned char *key, size_t key_len,
+                          const unsigned char *msg, size_t msg_len);
+
 /**
  * hmac_sha512 - Compute an HMAC using SHA-512
  *

libwally-core/src/internal.h

@@ -19,7 +19,6 @@ const secp256k1_context *secp_ctx(void);
 #define PUBKEY_COMPRESSED   SECP256K1_EC_COMPRESSED
 #define PUBKEY_UNCOMPRESSED SECP256K1_EC_UNCOMPRESSED
 
-
 inline static void clear(void *p, size_t len)
 {
     clear_n(1, p, len);

lightningcore/commit_tx.c

@@ -294,4 +294,4 @@ size_t find_htlc_output_from_commit_tx(const struct bitcoin_tx* commit_tx,
 
     tal_free(tmpctx);
     return ret;
-}
+}

lightningcore/lnchannel.h

@@ -168,4 +168,4 @@ void lnchn_notify_tx_delivered(struct LNchannel *chn, const struct bitcoin_tx *t
     enum outsourcing_deliver ret, const struct sha256_double *taskid);
 
 
-#endif /* LIGHTNING_CORE_LNCHANNEL_H */
+#endif /* LIGHTNING_CORE_LNCHANNEL_H */

lightningcore/lnchannel_api.c

@@ -261,4 +261,4 @@ int        LNAPI_channelnotify_revo_commit(struct LNchannel *chn,
 int        LNAPI_channelnotify_commit_done(struct LNchannel *chn)
 {
     return lnchn_notify_commit_done(chn)? 0 : check_failure(chn);
-}
+}

lightninglite/manager_dummy.cpp

@@ -250,4 +250,4 @@ namespace lnl_dummy {
     {
         return nullptr; 
     }
-}
+}