diff options
| author | victor <victor@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2004-09-12 11:31:16 +0800 |
|---|---|---|
| committer | victor <victor@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2004-09-12 11:31:16 +0800 |
| commit | 535e458a1b28ecdf69dddcace060807e462980fd (patch) | |
| tree | 6321dcb267e99a267c85cc113695e27b76cb1f70 /innbbsd | |
| parent | fa932118b9ab9bffa96c1e73ab4aa982f60292cb (diff) | |
| download | pttbbs-535e458a1b28ecdf69dddcace060807e462980fd.tar pttbbs-535e458a1b28ecdf69dddcace060807e462980fd.tar.gz pttbbs-535e458a1b28ecdf69dddcace060807e462980fd.tar.bz2 pttbbs-535e458a1b28ecdf69dddcace060807e462980fd.tar.lz pttbbs-535e458a1b28ecdf69dddcace060807e462980fd.tar.xz pttbbs-535e458a1b28ecdf69dddcace060807e462980fd.tar.zst pttbbs-535e458a1b28ecdf69dddcace060807e462980fd.zip | |
Solaris compatible
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2193 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'innbbsd')
| -rw-r--r-- | innbbsd/Makefile | 7 | ||||
| -rw-r--r-- | innbbsd/bbsnnrp.c | 2 | ||||
| -rw-r--r-- | innbbsd/connectsock.c | 2 | ||||
| -rw-r--r-- | innbbsd/innbbsconf.h | 12 | ||||
| -rw-r--r-- | innbbsd/port.c | 2 |
5 files changed, 14 insertions, 11 deletions
diff --git a/innbbsd/Makefile b/innbbsd/Makefile index 9399d32d..585bce6f 100644 --- a/innbbsd/Makefile +++ b/innbbsd/Makefile @@ -57,13 +57,14 @@ SRCS = inndchannel.c innbbsd.c connectsock.c rfc931.c \ port.c str_decode.c MOBJS = makedbz.o bbslib.o file.o dbz.o closeonexec.o -HOBJS = mkhistory.o bbslib.o file.o his.o dbz.o port.o closeonexec.o +HOBJS = mkhistory.o bbslib.o file.o his.o dbz.o port.o closeonexec.o \ + $(BBS_REC_EXTRA_$(OSTYPE)) DBZOBJS = dbzserver.o dbzinnbbsd.o pmain.o connectsock.o bbslib.o his.o \ daemon.o file.o dbz.o dbztool.o rfc931.o port.o closeonexec.o \ morelog.o NNRPOBJS = bbsnnrp.o pmain.o bbslib.o connectsock.o file.o LINKOBJS = bbslink.o pmain.o inntobbs.o echobbslib.o connectsock.o file.o port.o\ - str_decode.o + str_decode.o $(BBS_REC_EXTRA_$(OSTYPE)) LINKOBJS2 = bbslink2.o pmain.o inntobbs.o echobbslib.o connectsock.o file.o port.o CTLOBJS = ctlinnbbsd.o pmain.o bbslib.o connectsock.o file.o INNBBSD = innbbsd mkhistory bbsnnrp ctlinnbbsd $(BBSLINK) @@ -97,7 +98,7 @@ irix: Solaris: solaris solaris: - @$(MAKE) EXTRAFLAGS="-DMMAP -DSOLARIS -DSYSV -I/usr/local/include/ -I../include/" LDFLAGS="-L/usr/local/lib -liconv -lsocket -lnsl -lkstat ../mbbsd/osdep.o" YACC="bison -y" target + @$(MAKE) EXTRAFLAGS="-DMMAP -DSolaris -DSYSV -I/usr/local/include/ -I../include/" LDFLAGS="-L/usr/local/lib -liconv -lsocket -lnsl -lkstat" YACC="bison -y" target FreeBSD: @$(MAKE) CC=cc EXTRAFLAGS="-DBSD44 -DMMAP -DGETRUSAGE" LDFLAGS="-lcrypt -liconv" target diff --git a/innbbsd/bbsnnrp.c b/innbbsd/bbsnnrp.c index 544e3336..6aeeeb86 100644 --- a/innbbsd/bbsnnrp.c +++ b/innbbsd/bbsnnrp.c @@ -11,6 +11,7 @@ */ #include "innbbsconf.h" +#include "osdep.h" #include <sys/mman.h> #ifndef AIX #include <sys/fcntl.h> @@ -18,7 +19,6 @@ #include "bbslib.h" #include "daemon.h" #include "nntp.h" -#include "osdep.h" #ifndef MAX_ARTS #define MAX_ARTS 100 diff --git a/innbbsd/connectsock.c b/innbbsd/connectsock.c index f61ff160..45796d0c 100644 --- a/innbbsd/connectsock.c +++ b/innbbsd/connectsock.c @@ -1,8 +1,8 @@ +#include "osdep.h" #include "innbbsconf.h" #include "daemon.h" #include <signal.h> #include <setjmp.h> -#include "osdep.h" static jmp_buf timebuf; diff --git a/innbbsd/innbbsconf.h b/innbbsd/innbbsconf.h index 4e068443..dcdc5f21 100644 --- a/innbbsd/innbbsconf.h +++ b/innbbsd/innbbsconf.h @@ -134,14 +134,14 @@ #if !defined(__svr4__) || defined(sun) #define WITH_TM_GMTOFF #endif -#if (defined(__svr4__) && defined(sun)) || defined(SOLARIS) -#ifndef SOLARIS -#define SOLARIS +#if (defined(__svr4__) && defined(sun)) || defined(Solaris) +#ifndef Solaris +#define Solaris #endif #define NO_getdtablesize -#define NO_bcopy -#define NO_bzero -#define NO_flock +//#define NO_bcopy +//#define NO_bzero +//#define NO_flock #define WITH_lockf #endif diff --git a/innbbsd/port.c b/innbbsd/port.c index 8962ea14..fab82771 100644 --- a/innbbsd/port.c +++ b/innbbsd/port.c @@ -13,6 +13,7 @@ getdtablesize() } #endif +#if 0 #if defined(SYSV) && !defined(WITH_RECORD_O) #include <fcntl.h> flock(fd, op) @@ -31,3 +32,4 @@ flock(fd, op) return lockf(fd, op, 0L); } #endif +#endif |