aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/memory.c8
-rw-r--r--src/memory.h7
2 files changed, 2 insertions, 13 deletions
diff --git a/src/memory.c b/src/memory.c
index fa066cf2aa..5bc23284dc 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -46,11 +46,10 @@ static void try_to_free_memory();
/*
* Note: if unsigned is 16 bits we can only allocate up to 64K with alloc().
- * Use lalloc for larger blocks.
*/
char_u *alloc(unsigned size)
{
- return lalloc((long_u)size, TRUE);
+ return xmalloc(size);
}
/// Try to free memory. Used when trying to recover from out of memory errors.
@@ -216,11 +215,6 @@ char *xstrndup(const char *str, size_t len)
}
-char_u *lalloc(long_u size, int message)
-{
- return (char_u *)xmalloc((size_t)size);
-}
-
/*
* Avoid repeating the error message many times (they take 1 second each).
* Did_outofmem_msg is reset when a character is read.
diff --git a/src/memory.h b/src/memory.h
index b70f6bdf2d..723e7af814 100644
--- a/src/memory.h
+++ b/src/memory.h
@@ -127,12 +127,7 @@ char *xstpcpy(char *restrict dst, const char *restrict src);
/// @param maxlen
char *xstpncpy(char *restrict dst, const char *restrict src, size_t maxlen);
-/// Old low level memory allocation function.
-///
-/// @deprecated use xmalloc() directly instead
-/// @param size
-/// @return pointer to allocated space. Never NULL
-char_u *lalloc(long_u size, int message) FUNC_ATTR_MALLOC FUNC_ATTR_ALLOC_SIZE(1);
void do_outofmem_msg(long_u size);
void free_all_mem(void);
+
#endif