diff options
| author | Elliot Lee <sopwith@cuc.ml.org> | 1998-11-30 19:07:15 +0000 |
|---|---|---|
| committer | Elliot Lee <sopwith@src.gnome.org> | 1998-11-30 19:07:15 +0000 |
| commit | 060978e069b3c1726c7a1fb3916c3e8c8348a813 (patch) | |
| tree | b92907dd3d6ca58cb5e5bf7e7481277feada033c /gdk/gdkrgb.c | |
| parent | 58ca2448eb7d0a337fd83bd2951f5d9adde81b7c (diff) | |
| download | gdk-pixbuf-060978e069b3c1726c7a1fb3916c3e8c8348a813.tar.gz | |
I submitted this patch twice to gtk-devel-list, and received no comments,
I submitted this patch twice to gtk-devel-list, and received no comments, so
am committing it. Although not exhaustively tested, I have been using this
gtk+ for a week w/o problems, and I did read the code to ensure that nothing
ever writes to these data structures. If by chance people encounter SEGV's in
gtk+ code that is setting values in global data structures, this patch could
be a possible culprit.
1998-11-30 Elliot Lee <sopwith@cuc.ml.org>
* {gdk,gtk}/*.c: Make read-only data structures "static const" to
allow them to be shared, mainly including (but not limited to) the
GtkTypeInfo structures for each class.
* gtk/gtkfilesel.c: Add /net to the "leave me alone" directory listing.
Diffstat (limited to 'gdk/gdkrgb.c')
| -rw-r--r-- | gdk/gdkrgb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c index ad124457a..818b29f3d 100644 --- a/gdk/gdkrgb.c +++ b/gdk/gdkrgb.c @@ -304,7 +304,7 @@ gdk_rgb_try_colormap (gint nr, gint ng, gint nb) static gboolean gdk_rgb_do_colormaps (void) { - const gint sizes[][3] = { + static const gint sizes[][3] = { /* { 6, 7, 6 }, */ { 6, 6, 6 }, { 6, 6, 5 }, @@ -316,7 +316,7 @@ gdk_rgb_do_colormaps (void) { 3, 3, 3 }, { 2, 2, 2 } }; - const gint n_sizes = sizeof(sizes) / (3 * sizeof(gint)); + static const gint n_sizes = sizeof(sizes) / (3 * sizeof(gint)); gint i; for (i = 0; i < n_sizes; i++) @@ -387,7 +387,7 @@ static guint32 gdk_rgb_score_visual (GdkVisual *visual) { guint32 quality, speed, sys, pseudo; - gchar* visual_names[] = + static const gchar* visual_names[] = { "static gray", "grayscale", @@ -535,7 +535,7 @@ void gdk_rgb_init (void) { gint i; - gint byte_order[1] = { 1 }; + static const gint byte_order[1] = { 1 }; /* check endian sanity */ #if G_BYTE_ORDER == G_BIG_ENDIAN @@ -982,7 +982,7 @@ static const guchar DM[128][128] = #define DM_WIDTH 8 #define DM_WIDTH_SHIFT 3 #define DM_HEIGHT 8 -static guchar DM[8][8] = +static const guchar DM[8][8] = { { 0, 32, 8, 40, 2, 34, 10, 42 }, { 48, 16, 56, 24, 50, 18, 58, 26 }, |