added g_list_nth_prev() which walks ->prev instead of ->next.

[platform/upstream/glib.git] / gtypes.h

diff --git a/gtypes.h b/gtypes.h
index 9614c73..eec6fa4 100644 (file)
--- a/gtypes.h
+++ b/gtypes.h
@@ -43,7 +43,6 @@ typedef short  gshort;
 typedef long   glong;
 typedef int    gint;
 typedef gint   gboolean;
-typedef gchar* gstring;
 
 typedef unsigned char   guchar;
 typedef unsigned short  gushort;
@@ -69,7 +68,7 @@ typedef const void *gconstpointer;
 
 typedef gint            (*GCompareFunc)         (gconstpointer  a,
                                                  gconstpointer  b);
-typedef gint            (*GCompareFuncData)     (gconstpointer  a,
+typedef gint            (*GCompareDataFunc)     (gconstpointer  a,
                                                  gconstpointer  b,
                                                 gpointer       user_data);
 typedef gboolean        (*GEqualFunc)           (gconstpointer  a,
@@ -324,5 +323,28 @@ struct _GTimeVal
 
 G_END_DECLS
 
+/* We prefix variable declarations so they can
+ * properly get exported in windows dlls.
+ */
+#ifndef GLIB_VAR
+#  ifdef G_PLATFORM_WIN32
+#    ifdef GLIB_STATIC_COMPILATION
+#      define GLIB_VAR extern
+#    else /* !GLIB_STATIC_COMPILATION */
+#      ifdef GLIB_COMPILATION
+#        ifdef DLL_EXPORT
+#          define GLIB_VAR __declspec(dllexport)
+#        else /* !DLL_EXPORT */
+#          define GLIB_VAR extern
+#        endif /* !DLL_EXPORT */
+#      else /* !GLIB_COMPILATION */
+#        define GLIB_VAR extern __declspec(dllimport)
+#      endif /* !GLIB_COMPILATION */
+#    endif /* !GLIB_STATIC_COMPILATION */
+#  else /* !G_PLATFORM_WIN32 */
+#    define GLIB_VAR extern
+#  endif /* !G_PLATFORM_WIN32 */
+#endif /* GLIB_VAR */
+
 #endif /* __G_TYPES_H__ */