summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorin2 <in2@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-09-22 20:14:39 +0800
committerin2 <in2@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-09-22 20:14:39 +0800
commit21295b3ae2d324312c343898db97f53b989d48b4 (patch)
treee74caaa7fce0f36a0293fe95ee7cd64b0efdcef0
parent81c98e60178549e9933961219d370252e91198cb (diff)
downloadpttbbs-21295b3ae2d324312c343898db97f53b989d48b4.tar
pttbbs-21295b3ae2d324312c343898db97f53b989d48b4.tar.gz
pttbbs-21295b3ae2d324312c343898db97f53b989d48b4.tar.bz2
pttbbs-21295b3ae2d324312c343898db97f53b989d48b4.tar.lz
pttbbs-21295b3ae2d324312c343898db97f53b989d48b4.tar.xz
pttbbs-21295b3ae2d324312c343898db97f53b989d48b4.tar.zst
pttbbs-21295b3ae2d324312c343898db97f53b989d48b4.zip
fix that adding file.c in r2207 causes compile failure in util/.
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2206 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--mbbsd/file.c3
-rw-r--r--util/Makefile4
2 files changed, 5 insertions, 2 deletions
diff --git a/mbbsd/file.c b/mbbsd/file.c
index aced35ff..8816776d 100644
--- a/mbbsd/file.c
+++ b/mbbsd/file.c
@@ -28,6 +28,8 @@ int file_append_line(char *file, char *string)
return 0;
}
+#ifndef _BBS_UTIL_C_
+/* Rename() is in kaede.c but not linked to util/ */
int file_delete_line(char *file, char *string)
{
FILE *fp, *nfp = NULL;
@@ -49,6 +51,7 @@ int file_delete_line(char *file, char *string)
fclose(nfp);
return 0;
}
+#endif
int file_exist_record(char *file, char *string)
{
diff --git a/util/Makefile b/util/Makefile
index 70c3387f..a4ee5cc9 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -8,11 +8,11 @@ BBSBASE= ../include/var.h
UTIL_OBJS= \
util_cache.o util_record.o util_passwd.o util_var.o \
- util_stuff.o util_osdep.o util_args.o
+ util_stuff.o util_osdep.o util_args.o util_file.o
MBBSD_OBJS= \
cache record passwd var \
- stuff osdep args
+ stuff osdep args file
# 下面這些程式, 會被 compile 並且和 $(UTIL_OBJS) 聯結
CPROG_WITH_UTIL= \