Avoid compiler warnings in the Cygwin-w32 build

* src/w32fns.c [DEFAULT_IMAGE_BASE]: Don't define on Cygwin.
* src/cygw32.h (w32_get_resource): Add prototype.  (Bug#71786)

(cherry picked from commit fb15affde8cb27ad358ad7070d150238cec11f99)

diff --git a/src/cygw32.h b/src/cygw32.h
index cc3414a39d92cd235dfad086593ecafb4c9f52c1..2f265cab4adf4cb59f43d98b6ad588318ead743d 100644 (file)
--- a/src/cygw32.h
+++ b/src/cygw32.h
@@ -35,5 +35,6 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 extern void syms_of_cygw32 (void);
 extern char * w32_strerror (int error_no);
+extern LPBYTE w32_get_resource (const char * key, const char * name, LPDWORD type);
 
 #endif /* CYGW32_H */

diff --git a/src/w32fns.c b/src/w32fns.c
index b784a9a563d719f39d26f44395bad00409438423..4c2f18abd084f72f319cd744ef6129ee53a150b1 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -11284,7 +11284,7 @@ typedef USHORT (WINAPI * CaptureStackBackTrace_proc) (ULONG, ULONG, PVOID *,
    configure.ac.  */
 #if defined MINGW_W64 && EMACS_INT_MAX > LONG_MAX
 # define DEFAULT_IMAGE_BASE (ptrdiff_t)0x400000000
-#else  /* 32-bit MinGW build */
+#elif !defined CYGWIN  /* 32-bit MinGW build */
 # define DEFAULT_IMAGE_BASE (ptrdiff_t)0x01000000
 #endif