From b0db901f1300cc733dc201f4d35dfdf753e9a472 Mon Sep 17 00:00:00 2001 From: David Griffith Date: Mon, 10 Sep 2018 05:01:14 -0700 Subject: [PATCH] Move some externs of os_ functions into frotz.h. --- src/common/fastmem.c | 3 --- src/common/frotz.h | 3 +++ src/common/quetzal.c | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/common/fastmem.c b/src/common/fastmem.c index 0f1c39e..d73e7a1 100644 --- 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 1310a6e..260b58d 100644 --- 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 31f3f13..53707ed 100644 --- 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; /* -- 2.34.1