Merge from trunk

[gnu-emacs] / src / font.h

diff --git a/src/font.h b/src/font.h
index 71cb26ccfdc3288eb2d2e7dc06b9a4ec3373c56a..3035a909efc6c609c04a3639c0fbe3026a8887b1 100644 (file)
--- a/src/font.h
+++ b/src/font.h
@@ -23,6 +23,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define EMACS_FONT_H
 
 #include "ccl.h"
+#include "frame.h"
 
 /* We have three types of Lisp objects related to font.