Add ifdef NS_IMPL_COCOA aound OSX version check (for clang)

[gnu-emacs] / src / fontset.h

diff --git a/src/fontset.h b/src/fontset.h
index 0c52ce34c1090d3157be7fe665ad3da7e562d02c..884244e6e612dd853b9e3016a202d4c5aa5702f5 100644 (file)
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -1,6 +1,5 @@
 /* Header for fontset handler.
-   Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001-2014 Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
      2005, 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
@@ -27,29 +26,20 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef EMACS_FONTSET_H
 #define EMACS_FONTSET_H
 
-/* Check if any window system is used now.  */
-extern void (*check_window_system_func) (void);
+extern void free_face_fontset (struct frame *, struct face *);
+extern int face_for_char (struct frame *, struct face *, int,
+                          ptrdiff_t, Lisp_Object);
+extern Lisp_Object font_for_char (struct face *, int, ptrdiff_t, Lisp_Object);
 
-struct face;
-
-extern void free_face_fontset (FRAME_PTR, struct face *);
-extern int face_suitable_for_char_p (struct face *, int);
-extern int face_for_char (FRAME_PTR, struct face *, int,
-                          int, Lisp_Object);
-extern Lisp_Object font_for_char (struct face *, int, int, Lisp_Object);
-
-extern int make_fontset_for_ascii_face (FRAME_PTR, int, struct face *);
+extern int make_fontset_for_ascii_face (struct frame *, int, struct face *);
 extern int fontset_from_font (Lisp_Object);
 extern int fs_query_fontset (Lisp_Object, int);
-EXFUN (Fquery_fontset, 2);
 extern Lisp_Object list_fontsets (struct frame *, Lisp_Object, int);
 
 extern Lisp_Object Qlatin;
 extern Lisp_Object fontset_name (int);
 extern Lisp_Object fontset_ascii (int);
 
-struct font;
 extern int face_for_font (struct frame *, Lisp_Object, struct face *);
 
 #endif /* EMACS_FONTSET_H */
-