emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

scratch/igc 66e3965c4c0: Unbreak 32-bit builds


From: Eli Zaretskii
Subject: scratch/igc 66e3965c4c0: Unbreak 32-bit builds
Date: Sun, 5 May 2024 11:45:21 -0400 (EDT)

branch: scratch/igc
commit 66e3965c4c0139b4165b7f63a125352d674ab614
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Unbreak 32-bit builds
    
    * src/igc.c (igc_make_ptr_vec): Allocate space for 'struct
    igc_header' plus N-1 pointers.
    (fix_ptr_vec): Remove igc_static_assert, which fails in 32-bit
    builds.
---
 src/igc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/igc.c b/src/igc.c
index 5d03010846d..66fd6315586 100644
--- a/src/igc.c
+++ b/src/igc.c
@@ -1082,7 +1082,6 @@ fix_ptr_vec (mps_ss_t ss, void *client)
   {
     struct igc_header *h = client_to_base (client);
     void **v = client;
-    igc_static_assert (sizeof *h == sizeof *v);
     for (size_t i = 0; i < h->nwords - 1; ++i)
       IGC_FIX12_RAW (ss, &v[i]);
   }
@@ -2978,7 +2977,8 @@ igc_make_face_cache (void)
 void *
 igc_make_ptr_vec (size_t n)
 {
-  return alloc (n * sizeof (void *), IGC_OBJ_PTR_VEC, PVEC_FREE);
+  return alloc (sizeof (struct igc_header) + (n - 1) * sizeof (void *),
+               IGC_OBJ_PTR_VEC, PVEC_FREE);
 }
 
 struct image_cache *



reply via email to

[Prev in Thread] Current Thread [Next in Thread]