From 91d5a13af9f0154bcb4b4493fda19165188b92ad Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 7 Jun 2024 16:34:53 +0300 Subject: [PATCH] Unbreak the Cygw32 build It was broken by latest changes to w32image.c. * src/emacs.c (main): Call 'syms_of_w32image' and 'globals_of_w32image' only if native image APIs are enabled. (Bug#71412) (cherry picked from commit b4b4c0fec4c52a8f9b067d1cca53fa8ddbf03799) --- src/emacs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/emacs.c b/src/emacs.c index 036bc1864e6..64f850c58a7 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -2359,7 +2359,9 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem syms_of_fringe (); syms_of_image (); #ifdef HAVE_NTGUI +# if HAVE_NATIVE_IMAGE_API syms_of_w32image (); +# endif #endif /* HAVE_NTGUI */ #endif /* HAVE_WINDOW_SYSTEM */ #ifdef HAVE_X_WINDOWS @@ -2498,7 +2500,9 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem globals_of_w32font (); globals_of_w32fns (); globals_of_w32menu (); +# if HAVE_NATIVE_IMAGE_API globals_of_w32image (); +# endif #endif /* HAVE_NTGUI */ #if defined WINDOWSNT || defined HAVE_NTGUI -- 2.39.2