diff options
author | Gerd Moellmann <gerd@gnu.org> | 2000-09-06 21:24:56 +0000 |
---|---|---|
committer | Gerd Moellmann <gerd@gnu.org> | 2000-09-06 21:24:56 +0000 |
commit | 09e9dd66e1acab8b399ae62400c13eeee310e888 (patch) | |
tree | 1d0c2c45b04f106ad9cd22cc65f94db3794b794d /src/buffer.h | |
parent | b1b4ce06bb678b51d9a16ce3d287748225c19484 (diff) | |
download | emacs-09e9dd66e1acab8b399ae62400c13eeee310e888.tar.gz |
(R_ALLOC_DECLARE): Removed because unused.
(r_alloc, r_re_alloc, r_alloc_free): Use POINTER_TYPE and size_t
in prototypes.
Diffstat (limited to 'src/buffer.h')
-rw-r--r-- | src/buffer.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/buffer.h b/src/buffer.h index 789b8c53b0f..e732a4fa272 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -841,22 +841,23 @@ extern Lisp_Object Vtransient_mark_mode; #ifdef REL_ALLOC -extern char *r_alloc P_ ((char **, unsigned long)); -extern void r_alloc_free P_ ((char **ptr)); -extern char *r_re_alloc P_ ((char **, unsigned long)); - -#define BUFFER_ALLOC(data,size) \ - ((unsigned char *) r_alloc ((char **)&data, (size))) -#define BUFFER_REALLOC(data,size) \ - ((unsigned char *) r_re_alloc ((char **) &data, (size))) -#define BUFFER_FREE(data) (r_alloc_free ((char **) &data)) -#define R_ALLOC_DECLARE(var,data) (r_alloc_declare (&var, (data))) -#else +extern POINTER_TYPE *r_alloc P_ ((POINTER_TYPE **, size_t)); +extern POINTER_TYPE *r_re_alloc P_ ((POINTER_TYPE **, size_t)); +extern void r_alloc_free P_ ((POINTER_TYPE **ptr)); + +#define BUFFER_ALLOC(data, size) \ + ((unsigned char *) r_alloc ((POINTER_TYPE **) &data, (size))) +#define BUFFER_REALLOC(data, size) \ + ((unsigned char *) r_re_alloc ((POINTER_TYPE **) &data, (size))) +#define BUFFER_FREE(data) (r_alloc_free ((POINTER_TYPE **) &data)) + +#else /* not REL_ALLOC */ + #define BUFFER_ALLOC(data,size) (data = (unsigned char *) malloc ((size))) #define BUFFER_REALLOC(data,size) ((unsigned char *) realloc ((data), (size))) #define BUFFER_FREE(data) (free ((data))) -#define R_ALLOC_DECLARE(var,data) -#endif + +#endif /* not REL_ALLOC */ /*********************************************************************** Buffer-local Variables |