From 24b3e689cf6429d6a09ce8910d6b1735879bfdf4 Mon Sep 17 00:00:00 2001
From: victor <victor@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Sun, 5 Sep 2004 04:31:48 +0000
Subject: remove branch victor.screen add    branch victor.solaris with some
 modification

git-svn-id: http://opensvn.csie.org/pttbbs/branches/victor.solaris@2179 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 util/Makefile      | 6 +++---
 util/merge_board.c | 4 ++++
 util/reaper.c      | 4 ++++
 util/xchatd.h      | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'util')

diff --git a/util/Makefile b/util/Makefile
index 54e26131..68eb7ad8 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -24,14 +24,14 @@ CPROG_WITH_UTIL= \
 	reaper		buildAnnounce	inndBM		shmctl		\
 	outmail		chkhbf		checkmoney      merge_dir       \
 	transman	angel		gamblegive	checkdir	\
-	chesscountry
+	chesscountry	tunepasswd	buildir
 
 # 下面這些程式, 會直接被 compile
 CPROG_WITHOUT_UTIL= \
 	shmsweep	uhash_loader	showboard	\
 	countalldice	webgrep		bbsrf		initbbs		\
-	userlist	tunepasswd	buildir		merge_passwd	\
-	merge_board	xchatd		bbsmail         
+	userlist	xchatd		bbsmail         merge_passwd	\
+	merge_board	
 
 # 下面這些程式會被 install
 PROGS=	${UTIL_OBJS}	${CPROG_WITH_UTIL}	${CPROG_WITHOUT_UTIL}	\
diff --git a/util/merge_board.c b/util/merge_board.c
index 12f41346..b37f8c1a 100644
--- a/util/merge_board.c
+++ b/util/merge_board.c
@@ -7,6 +7,10 @@
 #include "config.h"
 #include "pttstruct.h"
 
+#ifdef Solaris
+#include <strings.h>
+#endif
+
 typedef struct hash_t {
     char *brdname;
     struct hash_t *next;
diff --git a/util/reaper.c b/util/reaper.c
index 2fc587e0..7904566d 100644
--- a/util/reaper.c
+++ b/util/reaper.c
@@ -49,7 +49,11 @@ int check(int n, userec_t *u) {
 int main(int argc, char **argv)
 {
     now = time(NULL);
+#ifdef Solaris
+    openlog("reaper", LOG_PID, SYSLOG_FACILITY);
+#else
     openlog("reaper", LOG_PID | LOG_PERROR, SYSLOG_FACILITY);
+#endif
     chdir(BBSHOME);
 
     attach_SHM();
diff --git a/util/xchatd.h b/util/xchatd.h
index d0a6e1e4..fed869eb 100644
--- a/util/xchatd.h
+++ b/util/xchatd.h
@@ -1,4 +1,4 @@
-/* $Id: xchatd.h,v 1.1 2002/03/07 15:13:46 in2 Exp $ */
+/* $Id$ */
 
 #ifndef _XCHAT_H_
 #define _XCHAT_H_
-- 
cgit v1.2.3