Merged trunk to current branch in ./include

git-svn-id: http://opensvn.csie.org/pttbbs/branches/Jaky.i18n@1973 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

4 files changed, 18 insertions, 2 deletions

diff --git a/include/common.h b/include/common.h
index bbec1585..b3ccfbed 100644
--- a/include/common.h
+++ b/include/common.h
@@ -189,6 +189,19 @@
 #define NOTREPLYING     -1
 #define REPLYING        0
 #define RECVINREPLYING  1
+
+#define LOG_CREAT       1
+#define LOG_VF          2
+
+
+#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
+    #define __builtin_expect(exp,c) (exp)
+
 #endif
 
 #define I18N SHM->i18nstr[cuser.language]
+
+#define likely(x)       __builtin_expect(!!(x), 1)
+#define unlikely(x)     __builtin_expect(!!(x), 0)
+
+#endif
diff --git a/include/config.h b/include/config.h
index 6ac1a261..b703526b 100644
--- a/include/config.h
+++ b/include/config.h
@@ -113,6 +113,10 @@
 #define HOTBOARDCACHE     (0)            /* 熱門看板快取 */
 #endif
 
+#ifndef INNTIMEZONE
+#define INNTIMEZONE       "+0800 (CST)"
+#endif
+
 /* 以下還未整理 */
 #define MAX_FRIEND        (256)          /* 載入 cache 之最多朋友數目 */
 #define MAX_REJECT        (32)           /* 載入 cache 之最多壞人數目 */
diff --git a/include/modes.h b/include/modes.h
index 4c629f2f..8c06317a 100644
--- a/include/modes.h
+++ b/include/modes.h
@@ -111,7 +111,6 @@
 #define MODE_BOARD       0x0008    /* 是否可以在 currboard 刪除、mark文章 */
 #define MODE_GROUPOP     0x0010    /* 是否為小組長 (可以在 MENU 開板) */
 #define MODE_DIGEST      0x0020    /* 是否為 digest mode */
-#define MODE_ETC         0x0040    /* 是否為 etc mode */
 #define MODE_SELECT      0x0080    /* 搜尋使用者標題 */
 #define MODE_DIRTY       0x0100    /* 是否更動過 userflag */
 
diff --git a/include/proto.h b/include/proto.h
index 0ea470e4..46441876 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -496,7 +496,7 @@ void sethomepath(char *buf, char *userid);
 void sethomedir(char *buf, char *userid);
 char *Cdate(time_t *clock);
 void sethomefile(char *buf, char *userid, char *fname);
-int log_file(char *fn, int ifcreate, const char *fmt,...);
+int log_file(char *fn, int flag, const char *fmt,...);
 void str_lower(char *t, char *s);
 int strstr_lower(char *str, char *tag);
 int cursor_key(int row, int column);