Fix GNUC_PREREQ for GCC 2.8.1 etc.

[gnu-emacs] / src / ftxfont.c

diff --git a/src/ftxfont.c b/src/ftxfont.c
index 7e4608b9b855dfd1ab0b404a18ef4f33e50865c7..f49d44ffc20330e2026442fceee7c9c262b2f57d 100644 (file)
--- a/src/ftxfont.c
+++ b/src/ftxfont.c
@@ -1,5 +1,5 @@
 /* ftxfont.c -- FreeType font driver on X (without using XFT).
 /* ftxfont.c -- FreeType font driver on X (without using XFT).

-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 Free Software Foundation, Inc.

    Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
    Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009


@@ -8,8 +8,8 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.

 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -24,19 +24,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <X11/Xlib.h>
 
 #include "lisp.h"
 #include <X11/Xlib.h>
 
 #include "lisp.h"

-#include "dispextern.h"

 #include "xterm.h"
 #include "frame.h"
 #include "blockinput.h"
 #include "xterm.h"
 #include "frame.h"
 #include "blockinput.h"

-#include "character.h"
-#include "charset.h"
-#include "fontset.h"

 #include "font.h"
 
 /* FTX font driver.  */
 
 #include "font.h"
 
 /* FTX font driver.  */
 

-static Lisp_Object Qftx;
-

 struct font_driver ftxfont_driver;
 
 struct ftxfont_frame_data
 struct font_driver ftxfont_driver;
 
 struct ftxfont_frame_data