summaryrefslogtreecommitdiffstats
path: root/mbbsd/var.c
diff options
context:
space:
mode:
authorvictor <victor@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2003-08-18 19:48:17 +0800
committervictor <victor@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2003-08-18 19:48:17 +0800
commitd6ec2525926e9cbd3afc4b06ccd0300b05ddb301 (patch)
tree392fb96c328623e76467817faf231711220fcdbd /mbbsd/var.c
parent522c7c914b0c8e3400684de08907f9748e42c97b (diff)
downloadpttbbs-d6ec2525926e9cbd3afc4b06ccd0300b05ddb301.tar
pttbbs-d6ec2525926e9cbd3afc4b06ccd0300b05ddb301.tar.gz
pttbbs-d6ec2525926e9cbd3afc4b06ccd0300b05ddb301.tar.bz2
pttbbs-d6ec2525926e9cbd3afc4b06ccd0300b05ddb301.tar.lz
pttbbs-d6ec2525926e9cbd3afc4b06ccd0300b05ddb301.tar.xz
pttbbs-d6ec2525926e9cbd3afc4b06ccd0300b05ddb301.tar.zst
pttbbs-d6ec2525926e9cbd3afc4b06ccd0300b05ddb301.zip
fix util merging error
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@1107 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'mbbsd/var.c')
-rw-r--r--mbbsd/var.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/mbbsd/var.c b/mbbsd/var.c
index 4ba3cf9e..7df518e5 100644
--- a/mbbsd/var.c
+++ b/mbbsd/var.c
@@ -1,4 +1,4 @@
-/* $Id: var.c,v 1.21 2003/07/20 00:55:34 in2 Exp $ */
+/* $Id$ */
#define INCLUDE_VAR_H
#include "bbs.h"
@@ -621,3 +621,13 @@ char *friend_file[8] = {
FN_WATER,
FN_VISABLE
};
+
+#ifdef PTTBBS_UTIL
+ #ifdef OUTTA_TIMER
+ #define COMMON_TIME (SHM->GV2.e.now)
+ #else
+ #define COMMON_TIME (time(0))
+ #endif
+#else
+ #define COMMON_TIME (now)
+#endif