comparison src/inline.c @ 5125:b5df3737028a ben-lisp-object

merge
author Ben Wing <ben@xemacs.org>
date Wed, 24 Feb 2010 01:58:04 -0600
parents d1247f3cc363 a6c778975d7d
children 97eb4942aec8
comparison
equal deleted inserted replaced
5124:623d57b7fbe8 5125:b5df3737028a
101 101
102 #include "console-stream-impl.h" 102 #include "console-stream-impl.h"
103 103
104 #ifdef HAVE_X_WINDOWS 104 #ifdef HAVE_X_WINDOWS
105 #include "console-x-impl.h" 105 #include "console-x-impl.h"
106 #ifdef USE_XFT 106 #ifdef HAVE_XFT
107 #include "font-mgr.h" 107 #include "font-mgr.h"
108 #endif 108 #endif
109 #endif 109 #endif
110 110
111 #ifdef HAVE_MS_WINDOWS 111 #ifdef HAVE_MS_WINDOWS