diff options
| author | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2008-03-26 19:37:54 +0800 |
|---|---|---|
| committer | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2008-03-26 19:37:54 +0800 |
| commit | 1ac9e4897fdf8839328d9c47d1d2f0cc27b02f1d (patch) | |
| tree | 83973191ff135758ff19a69b494f68161938d723 | |
| parent | 1fd54e1a460554949cabb4d3cbc8f98223da47ee (diff) | |
| download | pttbbs-1ac9e4897fdf8839328d9c47d1d2f0cc27b02f1d.tar pttbbs-1ac9e4897fdf8839328d9c47d1d2f0cc27b02f1d.tar.gz pttbbs-1ac9e4897fdf8839328d9c47d1d2f0cc27b02f1d.tar.bz2 pttbbs-1ac9e4897fdf8839328d9c47d1d2f0cc27b02f1d.tar.lz pttbbs-1ac9e4897fdf8839328d9c47d1d2f0cc27b02f1d.tar.xz pttbbs-1ac9e4897fdf8839328d9c47d1d2f0cc27b02f1d.tar.zst pttbbs-1ac9e4897fdf8839328d9c47d1d2f0cc27b02f1d.zip | |
- (internal) move osdep to libbbsutil
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4026 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
| -rw-r--r-- | include/libbbsutil.h | 1 | ||||
| -rw-r--r-- | innbbsd/Makefile | 2 | ||||
| -rw-r--r-- | mbbsd/Makefile | 1 | ||||
| -rw-r--r-- | src/libbbsutil/Makefile | 2 | ||||
| -rw-r--r-- | src/libbbsutil/alloc.c (renamed from mbbsd/alloc.c) | 0 | ||||
| -rw-r--r-- | src/libbbsutil/osdep.c (renamed from mbbsd/osdep.c) | 5 | ||||
| -rw-r--r-- | util/Makefile | 4 |
7 files changed, 9 insertions, 6 deletions
diff --git a/include/libbbsutil.h b/include/libbbsutil.h index aa892beb..10c9a928 100644 --- a/include/libbbsutil.h +++ b/include/libbbsutil.h @@ -4,6 +4,7 @@ #include <stdint.h> #include <sys/types.h> +#include "osdep.h" #include "config.h" // XXX for TIMET64, but config.h has too much thing I don't want ... #ifdef __GNUC__ diff --git a/innbbsd/Makefile b/innbbsd/Makefile index c8021368..3cc74564 100644 --- a/innbbsd/Makefile +++ b/innbbsd/Makefile @@ -33,7 +33,7 @@ all: ${PROGS} UTIL_DIR= $(SRCROOT)/util UTIL_OBJS= \ util_cache.o util_record.o util_passwd.o util_var.o \ - util_stuff.o util_osdep.o + util_stuff.o .for fn in ${UTIL_OBJS} LINK_UTIL_OBJS+= ${UTIL_DIR}/${fn} diff --git a/mbbsd/Makefile b/mbbsd/Makefile index 56cc71cd..b46c3574 100644 --- a/mbbsd/Makefile +++ b/mbbsd/Makefile @@ -10,7 +10,6 @@ SRCROOT= .. PROG= mbbsd CHESSOBJS= chc.o chc_tab.o chess.o go.o gomo.o dark.o reversi.o GAMEOBJS = card.o guess.o chicken.o othello.o -SYSOBJS = osdep.o COREOBJS = bbs.o announce.o read.o board.o cache.o brc.o mail.o record.o fav.o ACCOBJS = user.o register.o passwd.o TALKOBJS = talk.o chat.o friend.o diff --git a/src/libbbsutil/Makefile b/src/libbbsutil/Makefile index d5b20637..aaaf62d2 100644 --- a/src/libbbsutil/Makefile +++ b/src/libbbsutil/Makefile @@ -4,7 +4,7 @@ SRCROOT= ../.. CFLAGS+= -I$(SRCROOT)/include -OBJS= file.o lock.o log.o net.o sort.o string.o time.o crypt.o +OBJS= file.o lock.o log.o net.o sort.o string.o time.o crypt.o osdep.o TARGET= libbbsutil.a diff --git a/mbbsd/alloc.c b/src/libbbsutil/alloc.c index de676ce4..de676ce4 100644 --- a/mbbsd/alloc.c +++ b/src/libbbsutil/alloc.c diff --git a/mbbsd/osdep.c b/src/libbbsutil/osdep.c index a3fcb35c..f4d68ead 100644 --- a/mbbsd/osdep.c +++ b/src/libbbsutil/osdep.c @@ -1,5 +1,8 @@ /* $Id$ */ -#include "bbs.h" +#include "osdep.h" +#include <stdio.h> +#include <stdlib.h> +#include <stdarg.h> #ifdef NEED_STRLCAT diff --git a/util/Makefile b/util/Makefile index 69d89732..e649f794 100644 --- a/util/Makefile +++ b/util/Makefile @@ -9,11 +9,11 @@ BBSBASE= $(SRCROOT)/include/var.h UTIL_OBJS= \ util_cache.o util_record.o util_passwd.o util_var.o \ - util_stuff.o util_osdep.o + util_stuff.o MBBSD_OBJS= \ cache record passwd var \ - stuff osdep + stuff # 下面這些程式, 會被 compile 並且和 $(UTIL_OBJS) 聯結 CPROG_WITH_UTIL= \ |