Mercurial > emacs
changeset 29779:4fe4901e5113
(x_set_tool_bar_lines, free_frame_xic, compose_text, getenv, ctime)
(getwd): Removed.
(xmalloc, xrealloc, xfree): Declare using POINTER_TYPE.
| author | Dave Love <fx@gnu.org> |
|---|---|
| date | Tue, 20 Jun 2000 13:08:48 +0000 |
| parents | 40e36c9c5ab8 |
| children | 520e4132439f |
| files | src/lisp.h |
| diffstat | 1 files changed, 3 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lisp.h Tue Jun 20 12:58:43 2000 +0000 +++ b/src/lisp.h Tue Jun 20 13:08:48 2000 +0000 @@ -2841,13 +2841,9 @@ #ifdef HAVE_X_WINDOWS /* Defined in xfns.c */ -extern void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); extern void syms_of_xfns P_ ((void)); extern void init_xfns P_ ((void)); EXFUN (Fxw_display_color_p, 1); -#ifdef HAVE_X_I18N -extern void free_frame_xic P_ ((struct frame *)); -#endif /* Fixme: x_defined_color needs declaring, but needs FRAME_PTR and XColor. */ #endif /* HAVE_X_WINDOWS */ @@ -2859,18 +2855,15 @@ /* Defined in getloadavg.c */ extern int getloadavg P_ ((double [], int)); - -/* Defined in composite.c */ -extern void compose_text P_ ((int, int, Lisp_Object, Lisp_Object, Lisp_Object)); + /* Nonzero means Emacs has already been initialized. Used during startup to detect startup of dumped Emacs. */ extern int initialized; extern int immediate_quit; /* Nonzero means ^G can quit instantly */ -extern char *getenv (), *ctime (), *getwd (); -extern long *xmalloc (), *xrealloc (); -extern void xfree (); +extern POINTER_TYPE *xmalloc P_ ((int)); +extern POINTER_TYPE *xrealloc P_ ((POINTER_TYPE *, int)); extern char *xstrdup P_ ((char *)); extern char *egetenv P_ ((char *));