aboutsummaryrefslogtreecommitdiffstats
path: root/src/w32menu.c
diff options
context:
space:
mode:
authorEli Zaretskii2024-11-12 14:41:01 +0200
committerEli Zaretskii2024-11-12 14:41:01 +0200
commitb54fa15ffbb959e97ea0b77bfeb9ae412a63b4e8 (patch)
tree9b22b5eaa78159a774030478e72370bbcdce2fac /src/w32menu.c
parent6ddbe8c7010485f6bca80b6e898610d5831eac60 (diff)
downloademacs-b54fa15ffbb959e97ea0b77bfeb9ae412a63b4e8.tar.gz
emacs-b54fa15ffbb959e97ea0b77bfeb9ae412a63b4e8.zip
Fix Cygw32 build
* src/pdumper.c (dump_mm_heap_cb_release): Avoid NULL pointer dereference. * src/w32dwrite.c (INITGUID) [CYGWIN]: Don't define for Cygwin. * src/w32menu.c (w32_popup_dialog): Fix Cygw32 build. (Bug#74312)
Diffstat (limited to 'src/w32menu.c')
-rw-r--r--src/w32menu.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/w32menu.c b/src/w32menu.c
index c3d147841b6..b5f87ebb42c 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -186,6 +186,11 @@ task_dialog_callback (HWND hwnd, UINT msg, WPARAM wParam,
186Lisp_Object 186Lisp_Object
187w32_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents) 187w32_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents)
188{ 188{
189#ifdef NTGUI_UNICODE
190 typedef int (WINAPI *WideCharToMultiByte_Proc)(UINT,DWORD,LPCWSTR,int,LPSTR,
191 int,LPCSTR,LPBOOL);
192 static MultiByteToWideChar_Proc pMultiByteToWideChar = MultiByteToWideChar;
193#endif /* NTGUI_UNICODE */
189 check_window_system (f); 194 check_window_system (f);
190 195
191 if (task_dialog_indirect) 196 if (task_dialog_indirect)