Merged Irssi SVN (upcoming irssi 0.8.11).

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

diff --git a/apps/irssi/src/common.h b/apps/irssi/src/common.h
index f48b9a92e3566db562f9ed353d2c2984fd5e397e..f3cc8e60962f05b0d0e9b27b910b81e2206466fa 100644 (file)
--- a/apps/irssi/src/common.h
+++ b/apps/irssi/src/common.h
@@ -56,14 +56,18 @@
 #  include <gmodule.h>
 #endif
 
+#ifdef USE_GC
+#  define g_free(x) G_STMT_START { (x) = NULL; } G_STMT_END
+#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)
+#elif defined (UOFF_T_LONG_LONG)
 typedef unsigned long long uoff_t;
 #else
-typedef unsigned int uoff_t;
+#  error uoff_t size not set
 #endif
 
 /* input functions */