diff libgaim/internal.h @ 14912:390519f29a11

[gaim-migrate @ 17684] g_access() is GTK >= 2.8 - add a wrapper (for wingaim I included the code from glib to deal with filename encoding issues) Add inet_ntop() implementation for wingaim. committer: Tailor Script <tailor@pidgin.im>
author Daniel Atallah <daniel.atallah@gmail.com>
date Mon, 06 Nov 2006 20:29:24 +0000
parents 01db45fdd9cb
children 59189ce09f10
line wrap: on
line diff
--- a/libgaim/internal.h	Mon Nov 06 07:52:17 2006 +0000
+++ b/libgaim/internal.h	Mon Nov 06 20:29:24 2006 +0000
@@ -129,10 +129,6 @@
 #	include <glib/gstdio.h>
 #endif
 
-#ifdef _WIN32
-#include "win32dep.h"
-#endif
-
 #if !GLIB_CHECK_VERSION(2,6,0)
 #	define g_freopen freopen
 #	define g_fopen fopen
@@ -146,12 +142,20 @@
 #	define g_open open
 #endif
 
+#if !GLIB_CHECK_VERSION(2,8,0)
+#	define g_access access
+#endif
+
 #if !GLIB_CHECK_VERSION(2,10,0)
 #	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 _WIN32
+#include "win32dep.h"
+#endif
+
 /* ugly ugly ugly */
 /* This is a workaround for the fact that G_GINT64_MODIFIER and G_GSIZE_FORMAT
  * are only defined in Glib >= 2.4 */