aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPo Lu2024-06-27 09:59:57 +0800
committerPo Lu2024-06-27 09:59:57 +0800
commit8d55b38e2a1212c47bfb9f93a73fa50b9f291609 (patch)
tree37aff4d0e933774427df45b2ebfb4aaa9188ba2c /src
parent18e7a9f3d0c27385f8efeb2b1ef80b3446dca288 (diff)
downloademacs-8d55b38e2a1212c47bfb9f93a73fa50b9f291609.tar.gz
emacs-8d55b38e2a1212c47bfb9f93a73fa50b9f291609.zip
Fix Cygwin build
* src/w32uniscribe.c (syms_of_w32uniscribe_for_pdumper): Define and retrieve handle to USP10.DLL on Cygwin.
Diffstat (limited to 'src')
-rw-r--r--src/w32uniscribe.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index 6e07dfe1c99..1763ca5dc34 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -1538,12 +1538,13 @@ syms_of_w32uniscribe_for_pdumper (void)
1538 if (!initialized) 1538 if (!initialized)
1539 return; 1539 return;
1540 1540
1541#ifdef WINDOWSNT
1542 /* Don't register if Uniscribe is not available. */ 1541 /* Don't register if Uniscribe is not available. */
1543 HMODULE uniscribe = LoadLibrary ("usp10.dll"); 1542 HMODULE uniscribe;
1544 if (!uniscribe) 1543 if (!uniscribe)
1545 return; 1544 return;
1546 1545
1546#ifdef WINDOWSNT
1547 uniscribe = LoadLibrary ("usp10.dll");
1547 pfnScriptItemize = (void *) get_proc_addr (uniscribe, "ScriptItemize"); 1548 pfnScriptItemize = (void *) get_proc_addr (uniscribe, "ScriptItemize");
1548 pfnScriptShape = (void *) get_proc_addr (uniscribe, "ScriptShape"); 1549 pfnScriptShape = (void *) get_proc_addr (uniscribe, "ScriptShape");
1549 pfnScriptPlace = (void *) get_proc_addr (uniscribe, "ScriptPlace"); 1550 pfnScriptPlace = (void *) get_proc_addr (uniscribe, "ScriptPlace");
@@ -1561,15 +1562,16 @@ syms_of_w32uniscribe_for_pdumper (void)
1561 return; 1562 return;
1562 } 1563 }
1563#else /* Cygwin */ 1564#else /* Cygwin */
1565 uniscribe = GetModuleHandle ("usp10.dll");
1564 pfnScriptItemize = &ScriptItemize; 1566 pfnScriptItemize = &ScriptItemize;
1565 pfnScriptShape = &ScriptShape; 1567 pfnScriptShape = &ScriptShape;
1566 pfnScriptPlace = &ScriptPlace; 1568 pfnScriptPlace = &ScriptPlace;
1567 pfnScriptGetGlyphABCWidth = &ScriptGetGlyphABCWidth; 1569 pfnScriptGetGlyphABCWidth = &ScriptGetGlyphABCWidth;
1568 pfnScriptFreeCache = &ScriptFreeCache; 1570 pfnScriptFreeCache = &ScriptFreeCache;
1569 pfnScriptGetCMap = &ScriptGetCMap; 1571 pfnScriptGetCMap = &ScriptGetCMap;
1570#endif /* Cygwin */
1571 1572
1572 uniscribe_available = 1; 1573 uniscribe_available = 1;
1574#endif /* Cygwin */
1573 1575
1574 register_font_driver (&uniscribe_font_driver, NULL); 1576 register_font_driver (&uniscribe_font_driver, NULL);
1575 1577