summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-04-08 10:46:28 +0800
committerptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-04-08 10:46:28 +0800
commita0dc0d66b864c10fe6e1520e3869cd0c451fa32f (patch)
tree1497787aaf5899804125a837e8f84459af792cba
parentfbc660eda40610fb5ba57fae1f68fe4f2617ca8f (diff)
downloadpttbbs-a0dc0d66b864c10fe6e1520e3869cd0c451fa32f.tar
pttbbs-a0dc0d66b864c10fe6e1520e3869cd0c451fa32f.tar.gz
pttbbs-a0dc0d66b864c10fe6e1520e3869cd0c451fa32f.tar.bz2
pttbbs-a0dc0d66b864c10fe6e1520e3869cd0c451fa32f.tar.lz
pttbbs-a0dc0d66b864c10fe6e1520e3869cd0c451fa32f.tar.xz
pttbbs-a0dc0d66b864c10fe6e1520e3869cd0c451fa32f.tar.zst
pttbbs-a0dc0d66b864c10fe6e1520e3869cd0c451fa32f.zip
merge dir
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@1727 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--util/Makefile2
-rw-r--r--util/merge_dir.c11
2 files changed, 4 insertions, 9 deletions
diff --git a/util/Makefile b/util/Makefile
index 99461ffe..d64bd60b 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -38,7 +38,7 @@ PROGS= ${UTIL_OBJS} ${CPROG_WITH_UTIL} ${CPROG_WITHOUT_UTIL} \
stock.perl weather.perl toplazyBM.sh toplazyBBM.sh \
dailybackup.pl tarqueue.pl waterball.pl filtermail.pl \
getbackup.pl udnnews.pl rebuildaloha.pl railway_wrapper.pl\
- checkdir
+ checkdir merge_dir
all: ${CPROG_WITH_UTIL} ${CPROG_WITHOUT_UTIL} ${PROGS}
diff --git a/util/merge_dir.c b/util/merge_dir.c
index e81a9f7e..44fcd1f2 100644
--- a/util/merge_dir.c
+++ b/util/merge_dir.c
@@ -1,11 +1,6 @@
-/* $Id: merge_board.c 1096 2003-08-15 06:13:29Z victor $ */
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-#include <sys/types.h>
-#include "config.h"
-#include "pttstruct.h"
+/* $Id: merge_dir.c 1096 2003-08-15 06:13:29Z victor $ */
+#define _UTIL_C_
+#include "bbs.h"
void usage() {
fprintf(stderr, "Usage:\n\n"