aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorEli Zaretskii2010-09-22 12:03:34 -0400
committerEli Zaretskii2010-09-22 12:03:34 -0400
commit413d18e73de161f0618926ef73d170a7ef5c7a2f (patch)
tree874e4eac4e7b0843c67ad0969d5c945cb8c8639c /src/alloc.c
parent7390c1cdc8f29150299000e566de15e8e2432efa (diff)
downloademacs-413d18e73de161f0618926ef73d170a7ef5c7a2f.tar.gz
emacs-413d18e73de161f0618926ef73d170a7ef5c7a2f.zip
Fix some uses of int instead of EMACS_INT.
minibuf.c (Fminibuffer_contents) (Fminibuffer_contents_no_properties) (Fminibuffer_completion_contents): Use EMACS_INT for minibuffer positions. keyboard.c (command_loop_1): Use EMACS_INT to compare point with mark. alloc.c (make_uninit_string, make_uninit_multibyte_string) (allocate_string_data): Accept EMACS_INT for string length. editfns.c (Ffield_string, Ffield_string_no_properties) (make_buffer_string, make_buffer_string_both, Fbuffer_substring) (Fbuffer_substring_no_properties, find_field, Fdelete_field) (Ffield_string, Ffield_string_no_properties, Ffield_beginning) (Ffield_end): Use EMACS_INT for buffer positions. insdel.c (prepare_to_modify_buffer): Use EMACS_INT to compare point with mark. lisp.h (allocate_string_data, make_uninit_string) (make_uninit_multibyte_string, make_buffer_string) (make_buffer_string_both): Adjust prototypes.
Diffstat (limited to 'src/alloc.c')
-rw-r--r--src/alloc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 1f615a7d505..60b8016fb88 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1908,7 +1908,8 @@ allocate_string (void)
1908 S->data if it was initially non-null. */ 1908 S->data if it was initially non-null. */
1909 1909
1910void 1910void
1911allocate_string_data (struct Lisp_String *s, int nchars, int nbytes) 1911allocate_string_data (struct Lisp_String *s,
1912 EMACS_INT nchars, EMACS_INT nbytes)
1912{ 1913{
1913 struct sdata *data, *old_data; 1914 struct sdata *data, *old_data;
1914 struct sblock *b; 1915 struct sblock *b;
@@ -2412,7 +2413,7 @@ build_string (const char *str)
2412 occupying LENGTH bytes. */ 2413 occupying LENGTH bytes. */
2413 2414
2414Lisp_Object 2415Lisp_Object
2415make_uninit_string (int length) 2416make_uninit_string (EMACS_INT length)
2416{ 2417{
2417 Lisp_Object val; 2418 Lisp_Object val;
2418 2419
@@ -2428,7 +2429,7 @@ make_uninit_string (int length)
2428 which occupy NBYTES bytes. */ 2429 which occupy NBYTES bytes. */
2429 2430
2430Lisp_Object 2431Lisp_Object
2431make_uninit_multibyte_string (int nchars, int nbytes) 2432make_uninit_multibyte_string (EMACS_INT nchars, EMACS_INT nbytes)
2432{ 2433{
2433 Lisp_Object string; 2434 Lisp_Object string;
2434 struct Lisp_String *s; 2435 struct Lisp_String *s;