Move some externs of os_ functions into frotz.h.

diff --git a/src/common/fastmem.c b/src/common/fastmem.c
index 0f1c39e79918009761ebe47a26364943f136446a..d73e7a1e16cca00b02fe1c35d9047de3d1dd9a73 100644 (file)
--- a/src/common/fastmem.c
+++ b/src/common/fastmem.c
@@ -56,9 +56,6 @@ extern void split_window (zword);
 extern void script_open (void);
 extern void script_close (void);
 
-extern FILE *os_load_story (void);
-extern int os_storyfile_seek (FILE * fp, long offset, int whence);
-extern int os_storyfile_tell (FILE * fp);
 
 extern zword save_quetzal (FILE *, FILE *);
 extern zword restore_quetzal (FILE *, FILE *);

diff --git a/src/common/frotz.h b/src/common/frotz.h
index 1310a6e149c52377affa39aaa2394208a26db47c..260b58dc3ae14f50acb516a73b031a411c07a657 100644 (file)
--- a/src/common/frotz.h
+++ b/src/common/frotz.h
@@ -806,6 +806,7 @@ void        os_finish_with_sample ();
 int    os_font_data (int, int *, int *);
 void   os_init_screen (void);
 void   os_init_sound (void);
+FILE   *os_load_story (void);
 void   os_more_prompt (void);
 int    os_peek_colour (void);
 int    os_picture_data (int, int *, int *);
@@ -824,6 +825,8 @@ void        os_set_font (int);
 void   os_set_text_style (int);
 void   os_start_sample (int, int, int, zword);
 void   os_stop_sample ();
+int    os_storyfile_seek (FILE *, long, int);
+int    os_storyfile_tell (FILE *);
 int    os_string_width (const zchar *);
 void   os_init_setup (void);
 void   os_warn (const char *, ...);

diff --git a/src/common/quetzal.c b/src/common/quetzal.c
index 31f3f13c0ebf3432d30a5d7a53708788f2ff2714..53707edee00ea1889f925498392c0b59cbff0202 100644 (file)
--- a/src/common/quetzal.c
+++ b/src/common/quetzal.c
@@ -51,8 +51,6 @@
  * externs
  */
 
-extern int os_storyfile_seek(FILE * fp, long offset, int whence);
-
 typedef unsigned long zlong;
 
 /*