summaryrefslogtreecommitdiff
path: root/src/font.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2013-07-18 18:24:35 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2013-07-18 18:24:35 -0700
commit1396ac86dea5fccab800e4b25fdb5319381891eb (patch)
tree7f89955a2ab13f3ef4a40f14a48bbcc293c3b179 /src/font.c
parentc7064f05d3d660fbdd9e7a2feb0860b04f46ae0d (diff)
downloademacs-1396ac86dea5fccab800e4b25fdb5319381891eb.tar.gz
Fix obscure porting bug with varargs functions.
The code assumed that int is treated like ptrdiff_t in a vararg function, which is not a portable assumption. There was a similar -- though these days less likely -- porting problem with various assumptions that pointers of different types all smell the same as far as vararg functions is conserved. To make this problem less likely in the future, redo the API to use varargs functions. * alloc.c (make_save_value): Remove this vararg function. All uses changed to ... (make_save_int_int_int, make_save_obj_obj_obj_obj) (make_save_ptr_int, make_save_funcptr_ptr_obj, make_save_memory): New functions. (make_save_ptr): Rename from make_save_pointer, for consistency with the above. Define only on platforms that need it. All uses changed.
Diffstat (limited to 'src/font.c')
-rw-r--r--src/font.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/font.c b/src/font.c
index 80b4b76c4e4..124d5f9bd9e 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1861,7 +1861,7 @@ otf_open (Lisp_Object file)
else
{
otf = STRINGP (file) ? OTF_open (SSDATA (file)) : NULL;
- val = make_save_pointer (otf);
+ val = make_save_ptr (otf);
otf_list = Fcons (Fcons (file, val), otf_list);
}
return otf;