Mercurial > hg > xemacs-beta
diff src/inline.c @ 5178:97eb4942aec8
merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 29 Mar 2010 21:28:13 -0500 |
parents | 8b2f75cecb89 b5df3737028a |
children | 308d34e9f07d |
line wrap: on
line diff
--- a/src/inline.c Tue Feb 23 07:28:35 2010 -0600 +++ b/src/inline.c Mon Mar 29 21:28:13 2010 -0500 @@ -1,5 +1,6 @@ /* Repository for inline functions Copyright (C) 1995 Sun Microsystems, Inc. + Copyright (C) 2010 Ben Wing. This file is part of XEmacs. @@ -35,8 +36,8 @@ */ /* Note to maintainers: This file contains a list of all header files - that use the INLINE macro, either directly, or by using DECLARE_LRECORD. - i.e. the output of ``grep -l -w 'DECLARE_LRECORD|INLINE_HEADER' *.h'' */ + that use the INLINE macro, either directly, or by using DECLARE_LISP_OBJECT. + i.e. the output of ``grep -l -w 'DECLARE_LISP_OBJECT|INLINE_HEADER' *.h'' */ #define DONT_EXTERN_INLINE_HEADER_FUNCTIONS @@ -99,19 +100,26 @@ #include "database.h" #endif +#include "console-stream-impl.h" + #ifdef HAVE_X_WINDOWS -#include "glyphs-x.h" +#include "console-x-impl.h" #ifdef HAVE_XFT #include "font-mgr.h" #endif #endif #ifdef HAVE_MS_WINDOWS -#include "console-msw.h" +#include "console-msw-impl.h" +#endif + +#ifdef HAVE_TTY +#include "console-tty-impl.h" +#include "fontcolor-tty-impl.h" #endif #ifdef HAVE_GTK -#include "console-gtk.h" +#include "console-gtk-impl.h" #include "ui-gtk.h" #endif