$NetBSD: patch-64bit,v 1.1 2018/12/31 06:21:09 maya Exp $ Fix segfault on 64bit machines. From fedora via https://github.com/keirf/e-uae/commit/2fb753f2e453d96b6b2eab9358514cd96de9d960 diff --git a/src/gui-gtk/chipsetspeedpanel.c b/src/gui-gtk/chipsetspeedpanel.c index 8acea77..48773ee 100644 --- src/gui-gtk/chipsetspeedpanel.c.orig +++ src/gui-gtk/chipsetspeedpanel.c @@ -30,9 +30,9 @@ static void on_framerate_changed (GtkWidget *w, ChipsetSpeedPanel *panel); static void on_sprite_collisions_changed (GtkWidget *w, ChipsetSpeedPanel *panel); static void on_immediate_blits_changed (GtkWidget *w, ChipsetSpeedPanel *panel); -guint chipsetspeedpanel_get_type (void) +GtkType chipsetspeedpanel_get_type (void) { - static guint chipsetspeedpanel_type = 0; + static GtkType chipsetspeedpanel_type = 0; if (!chipsetspeedpanel_type) { static const GtkTypeInfo chipsetspeedpanel_info = { diff --git a/src/gui-gtk/chipsetspeedpanel.h b/src/gui-gtk/chipsetspeedpanel.h index d821d77..1b4b6a9 100644 --- src/gui-gtk/chipsetspeedpanel.h.orig +++ src/gui-gtk/chipsetspeedpanel.h @@ -41,7 +41,7 @@ struct _ChipsetSpeedPanelClass void (* chipsetspeedpanel) (ChipsetSpeedPanel *chipsetspeedpanel ); }; -guint chipsetspeedpanel_get_type (void); +GtkType chipsetspeedpanel_get_type (void); GtkWidget* chipsetspeedpanel_new (void); void chipsetspeedpanel_set_framerate (ChipsetSpeedPanel *panel, guint framerate); diff --git a/src/gui-gtk/chipsettypepanel.c b/src/gui-gtk/chipsettypepanel.c index 5c4a7b9..c0f0017 100644 --- src/gui-gtk/chipsettypepanel.c.orig +++ src/gui-gtk/chipsettypepanel.c @@ -29,9 +29,9 @@ static void on_chipsettype_changed (GtkWidget *w, ChipsetTypePanel *panel); static void on_frequency_changed (GtkWidget *w, ChipsetTypePanel *panel); -guint chipsettypepanel_get_type (void) +GtkType chipsettypepanel_get_type (void) { - static guint chipsettypepanel_type = 0; + static GtkType chipsettypepanel_type = 0; if (!chipsettypepanel_type) { static const GtkTypeInfo chipsettypepanel_info = { diff --git a/src/gui-gtk/chipsettypepanel.h b/src/gui-gtk/chipsettypepanel.h index e4c7687..33c6a84 100644 --- src/gui-gtk/chipsettypepanel.h.orig +++ src/gui-gtk/chipsettypepanel.h @@ -34,7 +34,7 @@ struct _ChipsetTypePanelClass void (* chipsettypepanel) (ChipsetTypePanel *chipsettypepanel ); }; -guint chipsettypepanel_get_type (void); +GtkType chipsettypepanel_get_type (void); GtkWidget* chipsettypepanel_new (void); void chipsettypepanel_set_chipset_mask (ChipsetTypePanel *panel, guint chipset_mask); void chipsettypepanel_set_ntscmode (ChipsetTypePanel *panel, guint ntscmode); diff --git a/src/gui-gtk/chooserwidget.c b/src/gui-gtk/chooserwidget.c index 95a2d11..82e2113 100644 --- src/gui-gtk/chooserwidget.c.orig +++ src/gui-gtk/chooserwidget.c @@ -20,9 +20,9 @@ static void chooserwidget_class_init (ChooserWidgetClass *class); static guint chooser_get_choice_num (ChooserWidget *chooser); static void on_choice_changed (GtkWidget *w, ChooserWidget *chooser); -guint chooserwidget_get_type () +GtkType chooserwidget_get_type () { - static guint chooserwidget_type = 0; + static GtkType chooserwidget_type = 0; if (!chooserwidget_type) { static const GtkTypeInfo chooserwidget_info = { diff --git a/src/gui-gtk/chooserwidget.h b/src/gui-gtk/chooserwidget.h index 28cee26..93cee0b 100644 --- src/gui-gtk/chooserwidget.h.orig +++ src/gui-gtk/chooserwidget.h @@ -35,7 +35,7 @@ struct _ChooserWidgetClass void (* chooserwidget) (ChooserWidget *chooserwidget); }; -guint chooserwidget_get_type (void); +GtkType chooserwidget_get_type (void); GtkWidget* chooserwidget_new (void); void chooserwidget_clear (ChooserWidget *chooser); void chooserwidget_set_choice (ChooserWidget *chooser, guint choice_num); diff --git a/src/gui-gtk/cpuspeedpanel.c b/src/gui-gtk/cpuspeedpanel.c index 0e70299..a596a76 100644 --- src/gui-gtk/cpuspeedpanel.c.orig +++ src/gui-gtk/cpuspeedpanel.c @@ -24,9 +24,9 @@ static void on_adjust_changed (GtkWidget *w, CpuSpeedPanel *cspanel); static void on_idleenabled_toggled (GtkWidget *w, CpuSpeedPanel *cspanel); static void on_idlerate_changed (GtkWidget *w, CpuSpeedPanel *cspanel); -guint cpuspeedpanel_get_type () +GtkType cpuspeedpanel_get_type () { - static guint cpuspeedpanel_type = 0; + static GtkType cpuspeedpanel_type = 0; if (!cpuspeedpanel_type) { static const GtkTypeInfo cpuspeedpanel_info = { diff --git a/src/gui-gtk/cpuspeedpanel.h b/src/gui-gtk/cpuspeedpanel.h index 8b35076..ee8a899 100644 --- src/gui-gtk/cpuspeedpanel.h.orig +++ src/gui-gtk/cpuspeedpanel.h @@ -45,7 +45,7 @@ struct _CpuSpeedPanelClass void (* cpuspeedpanel) (CpuSpeedPanel *cpuspeedpanel ); }; -guint cpuspeedpanel_get_type (void); +GtkType cpuspeedpanel_get_type (void); GtkWidget* cpuspeedpanel_new (void); void cpuspeedpanel_set_cpuspeed (CpuSpeedPanel *cspanel, gint cpuspeed); void cpuspeedpanel_set_cpulevel (CpuSpeedPanel *cspanel, guint cpulevel); diff --git a/src/gui-gtk/cputypepanel.c b/src/gui-gtk/cputypepanel.c index 297b625..f6adbfd 100644 --- src/gui-gtk/cputypepanel.c.orig +++ src/gui-gtk/cputypepanel.c @@ -24,9 +24,9 @@ static void on_addr24bit_toggled (GtkWidget *w, CpuTypePanel *ctpanel); static void on_fpuenabled_toggled (GtkWidget *w, CpuTypePanel *ctpanel); static void on_accuracy_changed (GtkWidget *w, CpuTypePanel *ctpanel); -guint cputypepanel_get_type () +GtkType cputypepanel_get_type () { - static guint cputypepanel_type = 0; + static GtkType cputypepanel_type = 0; if (!cputypepanel_type) { static const GtkTypeInfo cputypepanel_info = { diff --git a/src/gui-gtk/cputypepanel.h b/src/gui-gtk/cputypepanel.h index fe702a1..9408fa2 100644 --- src/gui-gtk/cputypepanel.h.orig +++ src/gui-gtk/cputypepanel.h @@ -38,7 +38,7 @@ struct _CpuTypePanelClass void (* cputypepanel) (CpuTypePanel *cputypepanel ); }; -guint cputypepanel_get_type (void); +GtkType cputypepanel_get_type (void); GtkWidget* cputypepanel_new (void); void cputypepanel_set_cpulevel (CpuTypePanel *ctpanel, guint cpulevel); void cputypepanel_set_addr24bit (CpuTypePanel *ctpanel, guint addr24bit); diff --git a/src/gui-gtk/floppyfileentry.c b/src/gui-gtk/floppyfileentry.c index 2de3e8e..eb6294e 100644 --- src/gui-gtk/floppyfileentry.c.orig +++ src/gui-gtk/floppyfileentry.c @@ -22,9 +22,9 @@ static void floppyfileentry_class_init (FloppyFileEntryClass *class); static void on_eject (GtkWidget *w, FloppyFileEntry *ffe); static void on_insert (GtkWidget *w, FloppyFileEntry *ffe); -guint floppyfileentry_get_type () +GtkType floppyfileentry_get_type () { - static guint floppyfileentry_type = 0; + static GtkType floppyfileentry_type = 0; if (!floppyfileentry_type) { static const GtkTypeInfo floppyfileentry_info = { diff --git a/src/gui-gtk/floppyfileentry.h b/src/gui-gtk/floppyfileentry.h index d88286b..a86335a 100644 --- src/gui-gtk/floppyfileentry.h.orig +++ src/gui-gtk/floppyfileentry.h @@ -38,7 +38,7 @@ struct _FloppyFileEntryClass void (* floppyfileentry) (FloppyFileEntry *floppyfileentry); }; -guint floppyfileentry_get_type (void); +GtkType floppyfileentry_get_type (void); GtkWidget* floppyfileentry_new (void); void floppyfileentry_set_currentdir (FloppyFileEntry *ffentry, const gchar *filename); void floppyfileentry_set_filename (FloppyFileEntry *ffentry, const gchar *filename); diff --git a/src/gui-gtk/led.c b/src/gui-gtk/led.c index 295eb8f..94264df 100644 --- src/gui-gtk/led.c.orig +++ src/gui-gtk/led.c @@ -29,9 +29,9 @@ static void led_size_request (GtkWidget *widget, GtkRequisition *requisition); static void led_size_allocate (GtkWidget *widget, GtkAllocation *allocation); -guint led_get_type () +GtkType led_get_type () { - static guint led_type = 0; + static GtkType led_type = 0; if (!led_type) { static const GtkTypeInfo led_info = { diff --git a/src/gui-gtk/led.h b/src/gui-gtk/led.h index d55fa2f..26b35bb 100644 --- src/gui-gtk/led.h.orig +++ src/gui-gtk/led.h @@ -38,7 +38,7 @@ struct _LedClass GtkWidgetClass parent_class; }; -guint led_get_type (void); +GtkType led_get_type (void); GtkWidget* led_new (void); void led_set_off (Led *theled); void led_set_color (Led *theled, GdkColor col);