Merge Irssi 0.8.16-rc1

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

diff --git a/apps/irssi/src/common.h b/apps/irssi/src/common.h
index f3cc8e60962f05b0d0e9b27b910b81e2206466fa..1d614e167e158f7a37e7168939f338c57a7de9e2 100644 (file)
--- a/apps/irssi/src/common.h
+++ b/apps/irssi/src/common.h
@@ -1,11 +1,6 @@
 #ifndef __COMMON_H
 #define __COMMON_H
 
-#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() */
 
 #define IRSSI_GLOBAL_CONFIG "silc.conf" /* config file name in /etc/ */
@@ -14,7 +9,7 @@
 #define DEFAULT_SERVER_ADD_PORT 706
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "irssi-config.h"
 #endif
 
 #ifndef PACKAGE
@@ -25,12 +20,8 @@
 #include <stddef.h>
 #include <stdarg.h>
 #include <ctype.h>
-#  ifdef HAVE_STRING_H
 #include <string.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-#endif
+#include <stdlib.h>
 #include <errno.h>
 #include <time.h>
 
@@ -56,6 +47,15 @@
 #  include <gmodule.h>
 #endif
 
+#if !GLIB_CHECK_VERSION(2,10,0)
+#define g_slice_alloc(size)      g_malloc(size)
+#define g_slice_alloc0(size)     g_malloc0(size)
+#define g_slice_free1(size, mem) g_free(mem)
+#define g_slice_new(type)        g_new(type, 1)
+#define g_slice_new0(type)       g_new0(type, 1)
+#define g_slice_free(type, mem)  g_free(mem)
+#endif
+
 #ifdef USE_GC
 #  define g_free(x) G_STMT_START { (x) = NULL; } G_STMT_END
 #endif
@@ -114,8 +114,6 @@ const char *get_irssi_config(void);
 #define i_isxdigit(x) isxdigit((int) (unsigned char) (x))
 
 typedef struct _IPADDR IPADDR;
-typedef struct _CONFIG_REC CONFIG_REC;
-typedef struct _CONFIG_NODE CONFIG_NODE;
 
 typedef struct _LINEBUF_REC LINEBUF_REC;
 typedef struct _NET_SENDBUF_REC NET_SENDBUF_REC;