You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
24 lines
1.1 KiB
24 lines
1.1 KiB
Index: src/glyphs-gtk.h |
|
--- src/glyphs-gtk.h.orig 2004-05-11 04:40:46 +0200 |
|
+++ src/glyphs-gtk.h 2006-01-14 13:48:33 +0100 |
|
@@ -86,7 +86,7 @@ |
|
(GTK_IMAGE_INSTANCE_DATA (i)->pixmaps[slice]) |
|
#define IMAGE_INSTANCE_GTK_PIXMAP_SLICES(i) \ |
|
(GTK_IMAGE_INSTANCE_DATA (i)->pixmaps) |
|
-#define IMAGE_INSTANCE_GTK_MASK(i) (GdkPixmap*)(IMAGE_INSTANCE_PIXMAP_MASK (i)) |
|
+#define IMAGE_INSTANCE_GTK_MASK(i) (IMAGE_INSTANCE_PIXMAP_MASK (i)) |
|
#define IMAGE_INSTANCE_GTK_CURSOR(i) (GTK_IMAGE_INSTANCE_DATA (i)->cursor) |
|
#define IMAGE_INSTANCE_GTK_COLORMAP(i) (GTK_IMAGE_INSTANCE_DATA (i)->colormap) |
|
#define IMAGE_INSTANCE_GTK_PIXELS(i) (GTK_IMAGE_INSTANCE_DATA (i)->pixels) |
|
Index: src/s/sol2.h |
|
--- src/s/sol2.h.orig 2003-09-18 06:36:54.000000000 +0200 |
|
+++ src/s/sol2.h 2006-06-13 08:02:32.908936073 +0200 |
|
@@ -11,7 +11,7 @@ |
|
#endif |
|
|
|
/* Fix understandable GCC lossage on Solaris 2.6 */ |
|
-#if defined(__GNUC__) && OS_RELEASE >= 506 && !defined(NOT_C_CODE) |
|
+#if defined(__GNUC__) && OS_RELEASE >= 506 && OS_RELEASE < 510 && !defined(NOT_C_CODE) |
|
|
|
/* GCC va_list munging is a little messed up */ |
|
#define __GNUC_VA_LIST
|
|
|