Merge branch 'master' of ssh://alexl@git.gnome.org/git/gtk+

2009-04-07 19:29:19 +02:00
parent 5e0bd0c9be 3fb6fbd801
commit 4ecd6a0f89
14 changed files with 2948 additions and 3723 deletions
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@ -229,7 +229,7 @@ gdk_display_get_name (GdkDisplay *display)
  DWORD session_id;
  char *display_name;
  static const char *display_name_cache = NULL;
-  typedef BOOL (* PFN_ProcessIdToSessionId) (DWORD, DWORD *);
+  typedef BOOL (WINAPI *PFN_ProcessIdToSessionId) (DWORD, DWORD *);
  PFN_ProcessIdToSessionId processIdToSessionId;

  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);