Merged with Irssi 0.8.6.

[silc.git] / apps / irssi / src / common.h

diff --git a/apps/irssi/src/common.h b/apps/irssi/src/common.h
index d6cc0421d7f296cb5d18916e707c41f2311c5213..b88cd9da9af7ddcbc1a7588f241f98862dda9384 100644 (file)
--- a/apps/irssi/src/common.h
+++ b/apps/irssi/src/common.h
@@ -1,8 +1,9 @@
 #ifndef __COMMON_H
 #define __COMMON_H
 
-#define IRSSI_AUTHOR "Timo Sirainen <tss@iki.fi>"
 #define IRSSI_WEBSITE "http://irssi.org/"
+#define IRSSI_AUTHOR_EMAIL "cras@irssi.org"
+#define IRSSI_AUTHOR "Timo Sirainen <"IRSSI_AUTHOR_EMAIL">"
 
 #define IRSSI_DIR_SHORT "~/.silc"
 #define IRSSI_DIR_FULL "%s/.silc" /* %s == g_get_home_dir() */
@@ -10,6 +11,8 @@
 #define IRSSI_GLOBAL_CONFIG "silc.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "silc.conf" /* config file name in ~/.irssi/ */
 
+#define DEFAULT_SERVER_ADD_PORT 706
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -49,6 +52,16 @@
 #  include <gmodule.h>
 #endif
 
+#if defined (UOFF_T_INT)
+typedef unsigned int uoff_t;
+#elif defined (UOFF_T_LONG)
+typedef unsigned long uoff_t;
+#elif defined (UOFF_T_LONGLONG)
+typedef unsigned long long uoff_t;
+#else
+#  error uoff_t size not set
+#endif
+
 /* input functions */
 #define G_INPUT_READ   (1 << 0)
 #define G_INPUT_WRITE  (1 << 1)
@@ -100,6 +113,7 @@ typedef struct _LINEBUF_REC LINEBUF_REC;
 typedef struct _NET_SENDBUF_REC NET_SENDBUF_REC;
 typedef struct _RAWLOG_REC RAWLOG_REC;
 
+typedef struct _CHAT_PROTOCOL_REC CHAT_PROTOCOL_REC;
 typedef struct _CHATNET_REC CHATNET_REC;
 typedef struct _SERVER_REC SERVER_REC;
 typedef struct _WI_ITEM_REC WI_ITEM_REC;