comparison src/inline.c @ 5140:e5380fdaf8f1

merge
author Ben Wing <ben@xemacs.org>
date Sat, 13 Mar 2010 05:38:34 -0600
parents b5df3737028a
children 97eb4942aec8
comparison
equal deleted inserted replaced
5139:a48ef26d87ee 5140:e5380fdaf8f1
33 Some compilers that recognize `inline' may not do the same 33 Some compilers that recognize `inline' may not do the same
34 `inline extern' business, so on those we just do `inline static'. 34 `inline extern' business, so on those we just do `inline static'.
35 */ 35 */
36 36
37 /* Note to maintainers: This file contains a list of all header files 37 /* Note to maintainers: This file contains a list of all header files
38 that use the INLINE macro, either directly, or by using DECLARE_LRECORD. 38 that use the INLINE macro, either directly, or by using DECLARE_LISP_OBJECT.
39 i.e. the output of ``grep -l -w 'DECLARE_LRECORD|INLINE_HEADER' *.h'' */ 39 i.e. the output of ``grep -l -w 'DECLARE_LISP_OBJECT|INLINE_HEADER' *.h'' */
40 40
41 #define DONT_EXTERN_INLINE_HEADER_FUNCTIONS 41 #define DONT_EXTERN_INLINE_HEADER_FUNCTIONS
42 42
43 #include <config.h> 43 #include <config.h>
44 #include "lisp.h" 44 #include "lisp.h"
97 97
98 #ifdef HAVE_DATABASE 98 #ifdef HAVE_DATABASE
99 #include "database.h" 99 #include "database.h"
100 #endif 100 #endif
101 101
102 #include "console-stream-impl.h"
103
102 #ifdef HAVE_X_WINDOWS 104 #ifdef HAVE_X_WINDOWS
103 #include "glyphs-x.h" 105 #include "console-x-impl.h"
104 #ifdef HAVE_XFT 106 #ifdef HAVE_XFT
105 #include "font-mgr.h" 107 #include "font-mgr.h"
106 #endif 108 #endif
107 #endif 109 #endif
108 110
109 #ifdef HAVE_MS_WINDOWS 111 #ifdef HAVE_MS_WINDOWS
110 #include "console-msw.h" 112 #include "console-msw-impl.h"
113 #endif
114
115 #ifdef HAVE_TTY
116 #include "console-tty-impl.h"
117 #include "objects-tty-impl.h"
111 #endif 118 #endif
112 119
113 #ifdef HAVE_GTK 120 #ifdef HAVE_GTK
114 #include "console-gtk.h" 121 #include "console-gtk-impl.h"
115 #include "ui-gtk.h" 122 #include "ui-gtk.h"
116 #endif 123 #endif
117 124
118 #include "file-coding.h" 125 #include "file-coding.h"
119 126