summaryrefslogtreecommitdiffstats
path: root/include/proto.h
diff options
context:
space:
mode:
authorptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-06-26 10:03:37 +0800
committerptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-06-26 10:03:37 +0800
commit450ad26421aa1c38700dddc8899a3522e1cc5442 (patch)
tree92cd9e2cacca48bb627263c985b69f84037081d5 /include/proto.h
parent42d9500f4b43e6f6c5680d1a2fd5065164698d1f (diff)
downloadpttbbs-450ad26421aa1c38700dddc8899a3522e1cc5442.tar
pttbbs-450ad26421aa1c38700dddc8899a3522e1cc5442.tar.gz
pttbbs-450ad26421aa1c38700dddc8899a3522e1cc5442.tar.bz2
pttbbs-450ad26421aa1c38700dddc8899a3522e1cc5442.tar.lz
pttbbs-450ad26421aa1c38700dddc8899a3522e1cc5442.tar.xz
pttbbs-450ad26421aa1c38700dddc8899a3522e1cc5442.tar.zst
pttbbs-450ad26421aa1c38700dddc8899a3522e1cc5442.zip
Merge bbs merge moduleptt.fpg@2092
usage: make -D BBSMERGE to enable this module git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2091 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'include/proto.h')
-rw-r--r--include/proto.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/proto.h b/include/proto.h
index 25439698..c439b708 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -24,6 +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);
/* announce */
int a_menu(char *maintitle, char *path, int lastlevel);
@@ -339,6 +340,12 @@ int Xyz(void);
int Play_Play(void);
int Name_Menu(void);
+#ifdef MERGEBBS
+/* merge */
+int m_fpg(void);
+void m_fpg_brd(char *bname,char *fromdir);
+#endif
+
/* more */
int more(char *fpath, int promptend);