; Fix warnings in MinGW builds

* src/w32fns.c (msh_mousewheel): Declare.
* src/treesit.c (treesit_debug_print_linecol): Fix format
specifiers.

* lib-src/pop.c (pfn_getaddrinfo, pfn_freeaddrinfo): Now static.

(cherry picked from commit 82766b71a45a691e19386422d3a12a3e0321b2e8)

diff --git a/lib-src/pop.c b/lib-src/pop.c
index db6e7638990b399820606a81c34504de2115a6b8..dc48e2ddcc31a8f8d7e94f3ad1a50974487ef15d 100644 (file)
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1565,9 +1565,10 @@ find_crlf (char *in_string, int len)
 /* The following 2 functions are only available since XP, so we load
    them dynamically and provide fallbacks.  */
 
-int (WINAPI *pfn_getaddrinfo) (const char *, const char *,
-                              const struct addrinfo *, struct addrinfo **);
-void (WINAPI *pfn_freeaddrinfo) (struct addrinfo *);
+static int (WINAPI *pfn_getaddrinfo) (const char *, const char *,
+                                     const struct addrinfo *,
+                                     struct addrinfo **);
+static void (WINAPI *pfn_freeaddrinfo) (struct addrinfo *);
 
 static int
 load_ws2 (void)

diff --git a/src/treesit.c b/src/treesit.c
index 5db0f838d3e7b6de47a40887e811ccc7edfd8fad..7b8e5d161f7227e3f3a2593a089f196cce40b72d 100644 (file)
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -952,7 +952,7 @@ void treesit_debug_print_linecol (struct ts_linecol);
 void
 treesit_debug_print_linecol (struct ts_linecol linecol)
 {
-  printf ("{ line=%ld col=%ld bytepos=%ld }\n", linecol.line, linecol.col, linecol.bytepos);
+  printf ("{ line=%td col=%td bytepos=%td }\n", linecol.line, linecol.col, linecol.bytepos);
 }
 
 /* Returns true if BUF tracks linecol.  */

diff --git a/src/w32fns.c b/src/w32fns.c
index 493f33486fbff2af5eb5ff94ffacd5a5fa91e406..fd64b04691d61aa66fc6935d26710f890a9ace52 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -266,6 +266,7 @@ extern AppendMenuW_Proc unicode_append_menu;
 static int ignore_ime_char = 0;
 
 /* W95 mousewheel handler */
+extern unsigned int msh_mousewheel;
 unsigned int msh_mousewheel = 0;
 
 /* Timers */