diff options
| author | Eli Zaretskii | 2024-11-12 14:41:01 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2024-11-12 14:41:01 +0200 |
| commit | b54fa15ffbb959e97ea0b77bfeb9ae412a63b4e8 (patch) | |
| tree | 9b22b5eaa78159a774030478e72370bbcdce2fac /src/w32dwrite.c | |
| parent | 6ddbe8c7010485f6bca80b6e898610d5831eac60 (diff) | |
| download | emacs-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/w32dwrite.c')
| -rw-r--r-- | src/w32dwrite.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/w32dwrite.c b/src/w32dwrite.c index 32e2644af2c..29f9d5f1fed 100644 --- a/src/w32dwrite.c +++ b/src/w32dwrite.c | |||
| @@ -37,7 +37,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ | |||
| 37 | #include <math.h> | 37 | #include <math.h> |
| 38 | #include <windows.h> | 38 | #include <windows.h> |
| 39 | 39 | ||
| 40 | #ifndef MINGW_W64 | 40 | #if !defined MINGW_W64 && !defined CYGWIN |
| 41 | # define INITGUID | 41 | # define INITGUID |
| 42 | #endif | 42 | #endif |
| 43 | #include <initguid.h> | 43 | #include <initguid.h> |
| @@ -659,7 +659,7 @@ w32_dwrite_encode_char (struct font *font, int c) | |||
| 659 | if (dwrite_font_face == NULL) | 659 | if (dwrite_font_face == NULL) |
| 660 | return FONT_INVALID_CODE; | 660 | return FONT_INVALID_CODE; |
| 661 | hr = dwrite_font_face->lpVtbl->GetGlyphIndices (dwrite_font_face, | 661 | hr = dwrite_font_face->lpVtbl->GetGlyphIndices (dwrite_font_face, |
| 662 | &c, 1, &index); | 662 | (UINT32 *) &c, 1, &index); |
| 663 | if (verify_hr (hr, "Failed to GetGlyphIndices")) | 663 | if (verify_hr (hr, "Failed to GetGlyphIndices")) |
| 664 | { | 664 | { |
| 665 | if (index == 0) | 665 | if (index == 0) |