diff options
| author | wens <wens@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2012-01-26 21:41:36 +0800 |
|---|---|---|
| committer | wens <wens@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2012-01-26 21:41:36 +0800 |
| commit | e0324d5a88d6ec9817607bc4d7555be94a167090 (patch) | |
| tree | 7d442fe94d85b83b7aa8287c2959de2470ef4b2f | |
| parent | 1de3f1bc78cbdc0390453bd9c4be53567f84cb2c (diff) | |
| download | pttbbs-e0324d5a88d6ec9817607bc4d7555be94a167090.tar pttbbs-e0324d5a88d6ec9817607bc4d7555be94a167090.tar.gz pttbbs-e0324d5a88d6ec9817607bc4d7555be94a167090.tar.bz2 pttbbs-e0324d5a88d6ec9817607bc4d7555be94a167090.tar.lz pttbbs-e0324d5a88d6ec9817607bc4d7555be94a167090.tar.xz pttbbs-e0324d5a88d6ec9817607bc4d7555be94a167090.tar.zst pttbbs-e0324d5a88d6ec9817607bc4d7555be94a167090.zip | |
Include Big5/Unicode conversion, for other daemons to use.
The linker should be smart enough to not include it in mbbsd,
if CONVERT is not used.
git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5524 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
| -rw-r--r-- | pttbbs/common/sys/Makefile | 7 | ||||
| -rw-r--r-- | pttbbs/include/cmsys.h | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/pttbbs/common/sys/Makefile b/pttbbs/common/sys/Makefile index 8b587a3b..968ef937 100644 --- a/pttbbs/common/sys/Makefile +++ b/pttbbs/common/sys/Makefile @@ -4,11 +4,8 @@ SRCROOT= ../.. .include "$(SRCROOT)/pttbbs.mk" SRCS:= daemon.c file.c lock.c log.c net.c sort.c string.c time.c \ - crypt.c record.c vector.c telnet.c vbuf.c vtkbd.c - -.if $(WITH_CONVERT) != "NO" -SRCS+= utf8.c big5.c -.endif + crypt.c record.c vector.c telnet.c vbuf.c vtkbd.c \ + utf8.c big5.c LIB:= cmsys diff --git a/pttbbs/include/cmsys.h b/pttbbs/include/cmsys.h index b64e18b1..9b929f0f 100644 --- a/pttbbs/include/cmsys.h +++ b/pttbbs/include/cmsys.h @@ -297,7 +297,6 @@ void telnet_ctx_set_ttype_arg (TelnetCtx *ctx, void *arg); ssize_t telnet_process (TelnetCtx *ctx, unsigned char *buf, ssize_t size); -#ifdef CONVERT /* utf8.c */ int ucs2utf(uint16_t ucs2, uint8_t *utf8); int utf2ucs(uint8_t *utf8, uint16_t *pucs); @@ -306,6 +305,5 @@ int utf2ucs(uint8_t *utf8, uint16_t *pucs); extern const uint16_t b2u_table[]; extern const uint16_t u2b_table[]; extern const uint8_t b2u_ambiguous_width[]; -#endif #endif |