diff options
author | Anders Carlsson <andersca@gnu.org> | 2001-10-26 23:43:32 +0000 |
---|---|---|
committer | Anders Carlsson <andersca@src.gnome.org> | 2001-10-26 23:43:32 +0000 |
commit | 2a8aab4f18c480c84cf64dd0e249d5fdd08012be (patch) | |
tree | 3421f6a98ccaa4999595c538ce0b3259c9a5a00a /gdk | |
parent | dcb9a6e16e520fd39c831076849546d3bcd7a797 (diff) | |
download | gtk+-2a8aab4f18c480c84cf64dd0e249d5fdd08012be.tar.gz |
Ugh, broken pipe.
2001-10-27 Anders Carlsson <andersca@gnu.org>
* gdk/x11/gdkmain-x11.c: Replace int and guint with
long and gulong in some places to make the code 64-bit
clean.
(_gdk_windowing_init_check): Replace gint with gulong.
This patch was made by George Lebl and fixes bug #62113.
Diffstat (limited to 'gdk')
-rw-r--r-- | gdk/x11/gdkmain-x11.c | 2 | ||||
-rw-r--r-- | gdk/x11/gdkwindow-x11.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c index bc526a33e8..4dce680fa1 100644 --- a/gdk/x11/gdkmain-x11.c +++ b/gdk/x11/gdkmain-x11.c @@ -115,7 +115,7 @@ _gdk_windowing_init_check (int argc, char **argv) { XKeyboardState keyboard_state; XClassHint *class_hint; - guint pid; + gulong pid; _gdk_x11_initialize_locale (); diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 5b2df95ecf..a4563ba171 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -337,7 +337,7 @@ gdk_window_new (GdkWindow *parent, unsigned int class; char *title; int i; - int pid; + long pid; g_return_val_if_fail (attributes != NULL, NULL); @@ -2763,9 +2763,9 @@ void gdk_window_set_icon_list (GdkWindow *window, GList *pixbufs) { - guint *data; + gulong *data; guchar *pixels; - guint *p; + gulong *p; gint size; GList *l; GdkPixbuf *pixbuf; @@ -2794,7 +2794,7 @@ gdk_window_set_icon_list (GdkWindow *window, l = g_list_next (l); } - data = g_malloc (size*4); + data = g_malloc (size * sizeof (gulong)); l = pixbufs; p = data; |