summaryrefslogtreecommitdiff
path: root/src/w32uniscribe.c
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2014-09-25 12:34:53 +0300
committerEli Zaretskii <eliz@gnu.org>2014-09-25 12:34:53 +0300
commitdb61bdb13915a15896ffb96d1ea3d23e00f4bf54 (patch)
tree9fb3faba58b2ec6b9da881003bc742ea97df634f /src/w32uniscribe.c
parent340e4cce7aaa1de72d384e4889f0f8aa65025874 (diff)
downloademacs-db61bdb13915a15896ffb96d1ea3d23e00f4bf54.tar.gz
Default to stack objects on DOS_NT platforms as well.
src/w32term.h (ALIGN_STACK) [__GNUC__]: Define to __attribute__((force_align_arg_pointer)) for GCC 4.2 and later. src/lisp.h (USE_STACK_LISP_OBJECTS): Remove the !DOS_NT condition. src/w32proc.c (enum_locale_fn, enum_codepage_fn): Add the ALIGN_STACK attribute. src/w32fns.c (w32_monitor_enum): Add the ALIGN_STACK attribute. src/w32uniscribe.c (add_opentype_font_name_to_list): Add the ALIGN_STACK attribute. src/w32font.c (add_font_name_to_list, add_font_entity_to_list) (add_one_font_entity_to_list): Add the ALIGN_STACK attribute.
Diffstat (limited to 'src/w32uniscribe.c')
-rw-r--r--src/w32uniscribe.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index 7e6419c4d28..1c7b256988c 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -52,9 +52,9 @@ extern Lisp_Object Quniscribe;
extern Lisp_Object Qopentype;
/* EnumFontFamiliesEx callback. */
-static int CALLBACK add_opentype_font_name_to_list (ENUMLOGFONTEX *,
- NEWTEXTMETRICEX *,
- DWORD, LPARAM);
+static int CALLBACK ALIGN_STACK add_opentype_font_name_to_list (ENUMLOGFONTEX *,
+ NEWTEXTMETRICEX *,
+ DWORD, LPARAM);
/* Used by uniscribe_otf_capability. */
static Lisp_Object otf_features (HDC context, char *table);
@@ -613,7 +613,7 @@ uniscribe_encode_char (struct font *font, int c)
/* Callback function for EnumFontFamiliesEx.
Adds the name of opentype fonts to a Lisp list (passed in as the
lParam arg). */
-static int CALLBACK
+static int CALLBACK ALIGN_STACK
add_opentype_font_name_to_list (ENUMLOGFONTEX *logical_font,
NEWTEXTMETRICEX *physical_font,
DWORD font_type, LPARAM list_object)