From 1562021be3198239d60452a1be345e0f03ee9dab Mon Sep 17 00:00:00 2001 From: ptt Date: Thu, 1 Jul 2004 02:52:27 +0000 Subject: merge the branch from ptt.fpg git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2110 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- include/fpg.h | 3 ++- include/proto.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/fpg.h b/include/fpg.h index 8014c5b4..57ae46c3 100644 --- a/include/fpg.h +++ b/include/fpg.h @@ -104,7 +104,8 @@ typedef struct uschar cardfight[20]; uschar dragon[5]; PET pet; - char left[40]; + usint bank; + char left[36]; } ACCT; struct fileheader diff --git a/include/proto.h b/include/proto.h index c439b708..b0307d54 100644 --- a/include/proto.h +++ b/include/proto.h @@ -24,7 +24,7 @@ void setup_man(boardheader_t * board); void delete_symbolic_link(boardheader_t *bh, int bid); int make_symbolic_link(char *bname, int gid); int make_symbolic_link_interactively(int gid); -void merge_dir(char *dir1, char *dir2); +void merge_dir(char *dir1, char *dir2, int isoutter); /* announce */ int a_menu(char *maintitle, char *path, int lastlevel); -- cgit v1.2.3