aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-06-08 12:18:46 -0700
committerPaul Eggert2011-06-08 12:18:46 -0700
commite46bb31a9f62b157947257b444fb44b1f9a42db6 (patch)
tree9ddde31cfec639b1d1345962bad84d28514c24ef /src
parent6349ae4d9c0e2a2986e2800dcea6a029fbc60d23 (diff)
downloademacs-e46bb31a9f62b157947257b444fb44b1f9a42db6.tar.gz
emacs-e46bb31a9f62b157947257b444fb44b1f9a42db6.zip
* alloc.c (allocate_pseudovector): Don't use EMACS_INT when int would do.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/alloc.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6a353aa1f95..0c3028fb94a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -17,6 +17,7 @@
17 (inhibit_garbage_collection): Set gc_cons_threshold to max value. 17 (inhibit_garbage_collection): Set gc_cons_threshold to max value.
18 Previously, this ceilinged at INT_MAX, but that doesn't work on 18 Previously, this ceilinged at INT_MAX, but that doesn't work on
19 64-bit machines. 19 64-bit machines.
20 (allocate_pseudovector): Don't use EMACS_INT when int would do.
20 21
21 * alloc.c (Fmake_bool_vector): Don't assume vector size fits in int. 22 * alloc.c (Fmake_bool_vector): Don't assume vector size fits in int.
22 (allocate_vectorlike): Check for ptrdiff_t overflow. 23 (allocate_vectorlike): Check for ptrdiff_t overflow.
diff --git a/src/alloc.c b/src/alloc.c
index e04f60baf03..4530e0a7377 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -2832,7 +2832,7 @@ struct Lisp_Vector *
2832allocate_pseudovector (int memlen, int lisplen, EMACS_INT tag) 2832allocate_pseudovector (int memlen, int lisplen, EMACS_INT tag)
2833{ 2833{
2834 struct Lisp_Vector *v = allocate_vectorlike (memlen); 2834 struct Lisp_Vector *v = allocate_vectorlike (memlen);
2835 EMACS_INT i; 2835 int i;
2836 2836
2837 /* Only the first lisplen slots will be traced normally by the GC. */ 2837 /* Only the first lisplen slots will be traced normally by the GC. */
2838 for (i = 0; i < lisplen; ++i) 2838 for (i = 0; i < lisplen; ++i)