From c38c764445fd24443d1d13e9ce62861e9a2705ee Mon Sep 17 00:00:00 2001 From: Hourier Date: Sun, 23 Feb 2020 11:18:57 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#39670=20chuukei.h=20=E3=81=AB?= =?utf8?q?=E3=81=82=E3=82=8B=E3=81=B9=E3=81=8D=E3=83=97=E3=83=AD=E3=83=88?= =?utf8?q?=E3=82=BF=E3=82=A4=E3=83=97=E5=AE=A3=E8=A8=80=E3=82=92=20inet.h?= =?utf8?q?=20=E3=81=8B=E3=82=89=E7=A7=BB=E5=8B=95=20/=20Moved=20the=20decl?= =?utf8?q?erations=20of=20functions=20from=20inet.h=20to=20chuukei.h?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/chuukei.h | 6 +++++- src/cmd/cmd-dump.c | 1 + src/core.c | 1 + src/inet.h | 5 ----- src/main-win.c | 1 + 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/chuukei.h b/src/chuukei.h index adee4e29b..b321a3b93 100644 --- a/src/chuukei.h +++ b/src/chuukei.h @@ -1,7 +1,6 @@ #pragma once #ifdef CHUUKEI -/* chuukei.c */ extern bool chuukei_server; extern bool chuukei_client; @@ -10,3 +9,8 @@ extern void browse_chuukei(void); extern void flush_ringbuf(void); extern void prepare_chuukei_hooks(void); #endif + +extern void prepare_movie_hooks(void); +extern void prepare_browse_movie_aux(concptr filename); +extern void prepare_browse_movie(concptr filename); +extern void browse_movie(void); diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c index 415bae279..9d7cf4e1b 100644 --- a/src/cmd/cmd-dump.c +++ b/src/cmd/cmd-dump.c @@ -43,6 +43,7 @@ #include "cmd-dump.h" #include "term.h" #include "core.h" +#include "chuukei.h" #include "autopick.h" diff --git a/src/core.c b/src/core.c index 471fab702..19921f550 100644 --- a/src/core.c +++ b/src/core.c @@ -15,6 +15,7 @@ #include "core.h" #include "inet.h" #include "term.h" +#include "chuukei.h" #include "creature.h" diff --git a/src/inet.h b/src/inet.h index e8d5d990e..ae52bd7d7 100644 --- a/src/inet.h +++ b/src/inet.h @@ -1,6 +1,5 @@ #pragma once -/* inet.c */ extern int soc_write(int sd, char *buf, size_t sz); extern int soc_read(int sd, char *buf, size_t sz); extern void set_proxy(char *default_url, int default_port); @@ -8,9 +7,5 @@ extern int connect_server(int timeout, concptr host, int port); extern int disconnect_server(int sd); extern concptr soc_err(void); -extern void prepare_movie_hooks(void); -extern void prepare_browse_movie_aux(concptr filename); -extern void prepare_browse_movie(concptr filename); -extern void browse_movie(void); extern bool browsing_movie; diff --git a/src/main-win.c b/src/main-win.c index 58e8a5cf6..12630081c 100644 --- a/src/main-win.c +++ b/src/main-win.c @@ -96,6 +96,7 @@ #include "angband.h" #include "util.h" #include "inet.h" +#include "chuukei.h" #include "cmd-dump.h" #include "view-mainwindow.h" -- 2.11.0