Mercurial > hg > xemacs-beta
comparison src/inline.c @ 4918:c914214b788d
Automatic merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 03 Feb 2010 02:56:21 -0600 |
parents | a6c778975d7d |
children | b5df3737028a 8b2f75cecb89 |
comparison
equal
deleted
inserted
replaced
4915:bedf3747a6d7 | 4918:c914214b788d |
---|---|
99 #include "database.h" | 99 #include "database.h" |
100 #endif | 100 #endif |
101 | 101 |
102 #ifdef HAVE_X_WINDOWS | 102 #ifdef HAVE_X_WINDOWS |
103 #include "glyphs-x.h" | 103 #include "glyphs-x.h" |
104 #ifdef USE_XFT | 104 #ifdef HAVE_XFT |
105 #include "font-mgr.h" | 105 #include "font-mgr.h" |
106 #endif | 106 #endif |
107 #endif | 107 #endif |
108 | 108 |
109 #ifdef HAVE_MS_WINDOWS | 109 #ifdef HAVE_MS_WINDOWS |