Fix yeeloong compilation

commands/videotest.c

@@ -25,6 +25,7 @@
 #include <grub/term.h>
 #include <grub/command.h>
 #include <grub/i18n.h>
+#include <grub/gfxmenu_view.h>
 
 static grub_err_t
 grub_cmd_videotest (grub_command_t cmd __attribute__ ((unused)),

gfxmenu/font.c

@@ -29,6 +29,7 @@
 #include <grub/charset.h>
 #include <grub/unicode.h>
 #include <grub/fontformat.h>
+#include <grub/gfxmenu_view.h>
 
 /* Draw a UTF-8 string of text on the current video render target.
    The x coordinate specifies the starting x position for the first character,

include/grub/font.h

@@ -100,9 +100,6 @@ int EXPORT_FUNC (grub_font_get_height) (grub_font_t font);
 
 int EXPORT_FUNC (grub_font_get_xheight) (grub_font_t font);
 
-int EXPORT_FUNC (grub_font_get_string_width) (grub_font_t font,
-					      const char *str);
-
 struct grub_font_glyph *EXPORT_FUNC (grub_font_get_glyph) (grub_font_t font,
 							   grub_uint32_t code);
 
@@ -113,11 +110,6 @@ grub_err_t EXPORT_FUNC (grub_font_draw_glyph) (struct grub_font_glyph *glyph,
 					       grub_video_color_t color,
 					       int left_x, int baseline_y);
 
-grub_err_t EXPORT_FUNC (grub_font_draw_string) (const char *str,
-						grub_font_t font,
-						grub_video_color_t color,
-						int left_x, int baseline_y);
-
 int
 EXPORT_FUNC (grub_font_get_constructed_device_width) (grub_font_t hinted_font,
 					const struct grub_unicode_glyph *glyph_id);

include/grub/gfxmenu_view.h

@@ -62,6 +62,14 @@ grub_gfxmenu_print_timeout (int timeout, void *data);
 void
 grub_gfxmenu_set_chosen_entry (int entry, void *data);
 
+grub_err_t grub_font_draw_string (const char *str,
+				  grub_font_t font,
+				  grub_video_color_t color,
+				  int left_x, int baseline_y);
+int grub_font_get_string_width (grub_font_t font,
+				const char *str);
+
+
 /* Implementation details -- this should not be used outside of the
    view itself.  */