* xfns.c (xpm_load) [!ALLOC_XPM_COLORS]: Declare local variable I in inner block.

[gnu-emacs] / src / fontset.h

diff --git a/src/fontset.h b/src/fontset.h
index 031fdbb431d31ca81e4a8bdf6727f215e9ad492a..9b90a7c5b8124bbd01b6c997a8a19e715c7bac5c 100644 (file)
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -19,8 +19,8 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#ifndef _FONTSET_H
-#define _FONTSET_H
+#ifndef EMACS_FONTSET_H
+#define EMACS_FONTSET_H
 
 /* This data type is used for the font_table field of window system
    depending data area (e.g. struct x_display_info on X window).  */
@@ -178,7 +178,7 @@ extern void (*check_window_system_func) P_ ((void));
 
 struct face;
 
-extern void fs_free_face_fontset P_ ((FRAME_PTR, struct face *));
+extern void free_face_fontset P_ ((FRAME_PTR, struct face *));
 extern Lisp_Object fontset_font_pattern P_ ((FRAME_PTR, int, int));
 extern int face_suitable_for_char_p P_ ((struct face *, int));
 extern int face_for_char P_ ((FRAME_PTR, struct face *, int));
@@ -232,4 +232,4 @@ extern Lisp_Object fontset_name P_ ((int));
 extern Lisp_Object fontset_ascii P_ ((int));
 extern int fontset_height P_ ((int));
 
-#endif /* _FONTSET_H */
+#endif /* EMACS_FONTSET_H */