diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-05-16 19:11:43 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-05-16 19:11:43 +0000 |
| commit | 85a8bdb1fc529b16201d4bbcd181e2ae3f58bbcc (patch) | |
| tree | b3218a613ff75a608cd28dda01e8da186e87b543 /demos | |
| parent | ce5029dfa9019fb408de180d446e1ffb8cbdc7e7 (diff) | |
| download | gtk+-85a8bdb1fc529b16201d4bbcd181e2ae3f58bbcc.tar.gz | |
Fixes for #78258
Thu May 16 14:51:14 2002 Owen Taylor <otaylor@redhat.com>
Fixes for #78258
* gtk/gtkrbtree.c demos/gtk-demo/editable-cells.c:
Fix some 64-bit warning problems. (Patch from Matthias
Clasen.)
* gtk/gtkrbtree.c (_gtk_rbtree_debug_spew_helper): Surround
a bunch of debug code with G_ENABLE_DEBUG.
* configure.in demos/gtk-demo/main.c: Replace
#ifndef G_OS_WIN32 with proper #ifdef HAVE_FLOCKFILE.
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/gtk-demo/editable_cells.c | 2 | ||||
| -rw-r--r-- | demos/gtk-demo/main.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/demos/gtk-demo/editable_cells.c b/demos/gtk-demo/editable_cells.c index dc59d7d48b..9d64b640e7 100644 --- a/demos/gtk-demo/editable_cells.c +++ b/demos/gtk-demo/editable_cells.c @@ -158,7 +158,7 @@ cell_edited (GtkCellRendererText *cell, gtk_tree_model_get_iter (model, &iter, path); - switch ((gint) column) + switch (G_POINTER_TO_INT (column)) { case COLUMN_NUMBER: { diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c index d96cc9fb0a..1a338338fb 100644 --- a/demos/gtk-demo/main.c +++ b/demos/gtk-demo/main.c @@ -86,7 +86,7 @@ read_line (FILE *stream, GString *str) { int n_read = 0; -#ifndef G_OS_WIN32 +#ifdef HAVE_FLOCKFILE flockfile (stream); #endif @@ -112,7 +112,7 @@ read_line (FILE *stream, GString *str) case '\r': case '\n': { -#ifndef G_OS_WIN32 +#ifdef HAVE_FLOCKFILE int next_c = getc_unlocked (stream); #else int next_c = getc (stream); @@ -132,7 +132,7 @@ read_line (FILE *stream, GString *str) done: -#ifndef G_OS_WIN32 +#ifdef HAVE_FLOCKFILE funlockfile (stream); #endif |