Gitweb links:

...log 
http://git.netsurf-browser.org/netsurf.git/shortlog/6239b32d92069595da0ba788311a3f9e4e71e690
...commit 
http://git.netsurf-browser.org/netsurf.git/commit/6239b32d92069595da0ba788311a3f9e4e71e690
...tree 
http://git.netsurf-browser.org/netsurf.git/tree/6239b32d92069595da0ba788311a3f9e4e71e690

The branch, master has been updated
       via  6239b32d92069595da0ba788311a3f9e4e71e690 (commit)
       via  36a2a77a8e09fd56dfaea0efb1af627e14b4ceae (commit)
      from  d0a1ee7ac0137a1ab51551649ce9f3f1522e4a39 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commitdiff 
http://git.netsurf-browser.org/netsurf.git/commit/?id=6239b32d92069595da0ba788311a3f9e4e71e690
commit 6239b32d92069595da0ba788311a3f9e4e71e690
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>

    Make browserglob private to gui.c

diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 508fde9..b32e58d 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -199,6 +199,7 @@ static BOOL locked_screen = FALSE;
 static int screen_signal = -1;
 static bool win_destroyed;
 static STRPTR nsscreentitle;
+static struct gui_globals browserglob;
 
 static struct MsgPort *applibport = NULL;
 static uint32 ami_appid = 0;
@@ -951,6 +952,11 @@ static void ami_gui_read_all_tooltypes(int argc, char 
**argv)
        }
 }
 
+void ami_gui_set_default_gg(void)
+{
+       glob = &browserglob;
+}
+
 static void gui_init2(int argc, char** argv)
 {
        struct Screen *screen;
@@ -962,7 +968,7 @@ static void gui_init2(int argc, char** argv)
        notalreadyrunning = ami_arexx_init(&rxsig);
 
        /* Treeview init code ends up calling a font function which needs this 
*/
-       glob = &browserglob;
+       ami_gui_set_default_gg();
 
        /* ...and this ensures the treeview at least gets the WB colour palette 
to work with */
        if(scrn == NULL) {
@@ -4412,7 +4418,7 @@ gui_window_create(struct browser_window *bw,
        g->shared->node = AddObject(window_list,AMINS_WINDOW);
        g->shared->node->objstruct = g->shared;
 
-       glob = &browserglob;
+       ami_gui_set_default_gg();
 
        if(locked_screen) {
                UnlockPubScreen(NULL,scrn);
@@ -4864,7 +4870,7 @@ static void ami_do_redraw(struct gui_window_2 *gwin)
                        .plot = &amiplot
                };
 
-               glob = &browserglob;
+               ami_gui_set_default_gg();
 
                if(nsoption_bool(direct_render) == false)
                {
diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h
index 3addea5..c1513a0 100644
--- a/frontends/amiga/gui.h
+++ b/frontends/amiga/gui.h
@@ -241,5 +241,9 @@ uint32 ami_gui_get_app_id(void);
  */
 STRPTR ami_gui_get_screen_title(void);
 
+/**
+ * Set gui_globals back to the default for the browser context
+ */
+void ami_gui_set_default_gg(void);
 #endif
 
diff --git a/frontends/amiga/history_local.c b/frontends/amiga/history_local.c
index e083496..c87b563 100755
--- a/frontends/amiga/history_local.c
+++ b/frontends/amiga/history_local.c
@@ -89,7 +89,7 @@ static void ami_history_redraw(struct history_window *hw)
        browser_window_history_redraw_rectangle(hw->gw->bw, xs, ys,
                        bbox->Width + xs, bbox->Height + ys, 0, 0, &ctx);
 
-       glob = &browserglob;
+       ami_gui_set_default_gg();
 
        ami_clearclipreg(hw->gg);
        ami_history_update_extent(hw);
diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c
index 9076eea..efb0b09 100644
--- a/frontends/amiga/plotters.c
+++ b/frontends/amiga/plotters.c
@@ -72,7 +72,6 @@ struct bez_point {
        float y;
 };
 
-struct gui_globals browserglob;
 struct gui_globals *glob;
 
 static int init_layers_count = 0;
diff --git a/frontends/amiga/plotters.h b/frontends/amiga/plotters.h
index e027189..7cb994f 100644
--- a/frontends/amiga/plotters.h
+++ b/frontends/amiga/plotters.h
@@ -46,7 +46,6 @@ struct gui_globals
 extern const struct plotter_table amiplot;
 
 extern struct gui_globals *glob;
-extern struct gui_globals browserglob;
 
 void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height, bool 
force32bit);
 void ami_free_layers(struct gui_globals *gg);
diff --git a/frontends/amiga/print.c b/frontends/amiga/print.c
index 56d2570..6926647 100644
--- a/frontends/amiga/print.c
+++ b/frontends/amiga/print.c
@@ -448,7 +448,7 @@ bool ami_print_cont(void)
                glob = ami_print_info.gg;
                print_draw_next_page(&amiprinter, ami_print_info.ps);
                ami_print_dump();
-               glob = &browserglob;
+               ami_gui_set_default_gg();
                ret = true;
        }
        else 
@@ -511,7 +511,7 @@ void ami_print_end(void)
        ami_free_layers(ami_print_info.gg);
        FreeVec(ami_print_info.gg);
        DisposeObject(ami_print_info.objects[OID_MAIN]);
-       glob = &browserglob;
+       ami_gui_set_default_gg();
 
        ami_print_close_device();
        ami_print_free();
diff --git a/frontends/amiga/tree.c b/frontends/amiga/tree.c
index f02fdcd..8328194 100644
--- a/frontends/amiga/tree.c
+++ b/frontends/amiga/tree.c
@@ -262,7 +262,7 @@ static void ami_tree_redraw_req_dr(void *p)
        ami_update_pointer(twin->win, GUI_POINTER_DEFAULT);
        ami_clearclipreg(glob);
        glob->rp = temprp;
-       glob = &browserglob;
+       ami_gui_set_default_gg();
 }
 
 static void ami_tree_redraw_req(void *p)
@@ -345,7 +345,7 @@ static void ami_tree_redraw_req(void *p)
        ami_gui_free_space_box(bbox);
        ami_update_pointer(twin->win, GUI_POINTER_DEFAULT);
        ami_clearclipreg(glob);
-       glob = &browserglob;
+       ami_gui_set_default_gg();
 }
 
 static void ami_tree_redraw_request(int x, int y, int width, int height, void 
*data)


commitdiff 
http://git.netsurf-browser.org/netsurf.git/commit/?id=36a2a77a8e09fd56dfaea0efb1af627e14b4ceae
commit 36a2a77a8e09fd56dfaea0efb1af627e14b4ceae
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>

    tidy-up

diff --git a/frontends/amiga/font_bullet.c b/frontends/amiga/font_bullet.c
index 5542ed9..48e49f3 100644
--- a/frontends/amiga/font_bullet.c
+++ b/frontends/amiga/font_bullet.c
@@ -643,7 +643,6 @@ static inline int32 ami_font_width_glyph(struct OutlineFont 
*ofont,
        int32 char_advance = 0;
        FIXED kern = 0;
        struct MinList *gwlist = NULL;
-       FIXED char1w = 0;
        struct GlyphWidthEntry *gwnode;
        bool skip_c2 = false;
        uint32 long_char_1 = 0;
@@ -678,6 +677,7 @@ static inline int32 ami_font_width_glyph(struct OutlineFont 
*ofont,
                        OT_WidthList, &gwlist,
                        TAG_END) == 0)
                {
+                       FIXED char1w = 0;
                        gwnode = (struct GlyphWidthEntry *)GetHead((struct List 
*)gwlist);
                        if(gwnode) char1w = gwnode->gwe_Width;
 
diff --git a/frontends/amiga/font_cache.c b/frontends/amiga/font_cache.c
index ea28573..08c2fe1 100644
--- a/frontends/amiga/font_cache.c
+++ b/frontends/amiga/font_cache.c
@@ -130,7 +130,7 @@ static void ami_font_cache_del_skiplist(struct SkipList 
*skiplist)
 
 struct ami_font_cache_node *ami_font_cache_locate(const char *font)
 {
-       struct ami_font_cache_node *nodedata;
+       struct ami_font_cache_node *nodedata = NULL;
        uint32 hash = 0;
 
 #ifdef __amigaos4__
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index ed4ce61..508fde9 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -935,13 +935,12 @@ static void ami_gui_read_all_tooltypes(int argc, char 
**argv)
 {
        struct WBStartup *WBenchMsg;
        struct WBArg *wbarg;
-       char i;
-       LONG olddir = -1;
+       char i = 0;
 
        if(argc == 0) { /* Started from WB */
                WBenchMsg = (struct WBStartup *)argv;
                for(i = 0, wbarg = WBenchMsg->sm_ArgList; i < 
WBenchMsg->sm_NumArgs; i++,wbarg++) {
-                       olddir =-1;
+                       LONG olddir =-1;
                        if((wbarg->wa_Lock) && (*wbarg->wa_Name))
                                olddir = SetCurrentDir(wbarg->wa_Lock);
 
@@ -3080,12 +3079,12 @@ static void gui_quit(void)
 char *ami_gui_get_cache_favicon_name(nsurl *url, bool only_if_avail)
 {
        STRPTR filename = NULL;
-       BPTR lock = 0;
 
        if ((filename = ASPrintf("%s/%x", current_user_faviconcache, 
nsurl_hash(url)))) {
                LOG("favicon cache location: %s", filename);
 
                if (only_if_avail == true) {
+                       BPTR lock = 0;
                        if((lock = Lock(filename, ACCESS_READ))) {
                                UnLock(lock);
                                return filename;
@@ -5563,7 +5562,7 @@ int main(int argc, char** argv)
                        LOG("WARNING: JSIMD_FORCENONE NOT SET");
                        SetVar("JSIMD_FORCENONE", "1", 1, GVF_GLOBAL_ONLY | 
GVF_SAVE_VAR);
                } else {
-                       LOG("JSIMDFORCENONE = %s (NB: Should be '1' for this 
architecture)", jsimd_forcenone);
+                       LOG("JSIMD_FORCENONE = %s (NB: Should be '1' for this 
architecture)", jsimd_forcenone);
                }
        }
 #endif
diff --git a/frontends/amiga/iff_dr2d.c b/frontends/amiga/iff_dr2d.c
index 966d2a6..aea7738 100644
--- a/frontends/amiga/iff_dr2d.c
+++ b/frontends/amiga/iff_dr2d.c
@@ -78,8 +78,6 @@ bool ami_svg_to_dr2d(struct IFFHandle *iffh, const char 
*buffer,
 {
        struct svgtiny_diagram *diagram;
        svgtiny_code code;
-       unsigned int i;
-       unsigned int j;
        BOOL fons_written = FALSE;
        struct fons_struct *fons;
        struct stxt_struct *stxt;
@@ -156,7 +154,7 @@ bool ami_svg_to_dr2d(struct IFFHandle *iffh, const char 
*buffer,
 
                if(!(PushChunk(iffh,0,ID_CMAP,IFFSIZE_UNKNOWN)))
                {
-                       for (i = 0; i != diagram->shape_count; i++) {
+                       for (unsigned int i = 0; i != diagram->shape_count; 
i++) {
                                if(diagram->shape[i].fill != 
svgtiny_TRANSPARENT)
                                {
                                        addcolour(diagram->shape[i].fill);
@@ -172,7 +170,7 @@ bool ami_svg_to_dr2d(struct IFFHandle *iffh, const char 
*buffer,
                        PopChunk(iffh);
                }
 
-       for (i = 0; i != diagram->shape_count; i++) {
+       for (unsigned int i = 0; i != diagram->shape_count; i++) {
                attr = ami_misc_allocvec_clear(sizeof(struct attr_struct), 0);
                if (diagram->shape[i].fill == svgtiny_TRANSPARENT)
                        attr->FillType = FT_NONE;
@@ -212,7 +210,7 @@ bool ami_svg_to_dr2d(struct IFFHandle *iffh, const char 
*buffer,
                        NumPoints = 0;
                        type = ID_OPLY;
 
-                       for (j = 0;
+                       for (unsigned int j = 0;
                                        j != diagram->shape[i].path_length; ) {
                                switch ((int) diagram->shape[i].path[j]) {
                                        case svgtiny_PATH_MOVE:
diff --git a/frontends/amiga/schedule.c b/frontends/amiga/schedule.c
index e34c000..2d63465 100755
--- a/frontends/amiga/schedule.c
+++ b/frontends/amiga/schedule.c
@@ -38,14 +38,14 @@ struct Device *TimerBase;
 struct TimerIFace *ITimer;
 #endif
 
-static APTR pool_nscb = NULL;
-static APTR pool_timereq = NULL;
+static APTR restrict pool_nscb = NULL;
+static APTR restrict pool_timereq = NULL;
 
 struct nscallback
 {
        struct TimeVal tv;
-       void *callback;
-       void *p;
+       void *restrict callback;
+       void *restrict p;
        struct TimeRequest *treq;
 };
 


-----------------------------------------------------------------------

Summary of changes:
 frontends/amiga/font_bullet.c   |    2 +-
 frontends/amiga/font_cache.c    |    2 +-
 frontends/amiga/gui.c           |   21 +++++++++++++--------
 frontends/amiga/gui.h           |    4 ++++
 frontends/amiga/history_local.c |    2 +-
 frontends/amiga/iff_dr2d.c      |    8 +++-----
 frontends/amiga/plotters.c      |    1 -
 frontends/amiga/plotters.h      |    1 -
 frontends/amiga/print.c         |    4 ++--
 frontends/amiga/schedule.c      |    8 ++++----
 frontends/amiga/tree.c          |    4 ++--
 11 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/frontends/amiga/font_bullet.c b/frontends/amiga/font_bullet.c
index 5542ed9..48e49f3 100644
--- a/frontends/amiga/font_bullet.c
+++ b/frontends/amiga/font_bullet.c
@@ -643,7 +643,6 @@ static inline int32 ami_font_width_glyph(struct OutlineFont 
*ofont,
        int32 char_advance = 0;
        FIXED kern = 0;
        struct MinList *gwlist = NULL;
-       FIXED char1w = 0;
        struct GlyphWidthEntry *gwnode;
        bool skip_c2 = false;
        uint32 long_char_1 = 0;
@@ -678,6 +677,7 @@ static inline int32 ami_font_width_glyph(struct OutlineFont 
*ofont,
                        OT_WidthList, &gwlist,
                        TAG_END) == 0)
                {
+                       FIXED char1w = 0;
                        gwnode = (struct GlyphWidthEntry *)GetHead((struct List 
*)gwlist);
                        if(gwnode) char1w = gwnode->gwe_Width;
 
diff --git a/frontends/amiga/font_cache.c b/frontends/amiga/font_cache.c
index ea28573..08c2fe1 100644
--- a/frontends/amiga/font_cache.c
+++ b/frontends/amiga/font_cache.c
@@ -130,7 +130,7 @@ static void ami_font_cache_del_skiplist(struct SkipList 
*skiplist)
 
 struct ami_font_cache_node *ami_font_cache_locate(const char *font)
 {
-       struct ami_font_cache_node *nodedata;
+       struct ami_font_cache_node *nodedata = NULL;
        uint32 hash = 0;
 
 #ifdef __amigaos4__
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index ed4ce61..b32e58d 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -199,6 +199,7 @@ static BOOL locked_screen = FALSE;
 static int screen_signal = -1;
 static bool win_destroyed;
 static STRPTR nsscreentitle;
+static struct gui_globals browserglob;
 
 static struct MsgPort *applibport = NULL;
 static uint32 ami_appid = 0;
@@ -935,13 +936,12 @@ static void ami_gui_read_all_tooltypes(int argc, char 
**argv)
 {
        struct WBStartup *WBenchMsg;
        struct WBArg *wbarg;
-       char i;
-       LONG olddir = -1;
+       char i = 0;
 
        if(argc == 0) { /* Started from WB */
                WBenchMsg = (struct WBStartup *)argv;
                for(i = 0, wbarg = WBenchMsg->sm_ArgList; i < 
WBenchMsg->sm_NumArgs; i++,wbarg++) {
-                       olddir =-1;
+                       LONG olddir =-1;
                        if((wbarg->wa_Lock) && (*wbarg->wa_Name))
                                olddir = SetCurrentDir(wbarg->wa_Lock);
 
@@ -952,6 +952,11 @@ static void ami_gui_read_all_tooltypes(int argc, char 
**argv)
        }
 }
 
+void ami_gui_set_default_gg(void)
+{
+       glob = &browserglob;
+}
+
 static void gui_init2(int argc, char** argv)
 {
        struct Screen *screen;
@@ -963,7 +968,7 @@ static void gui_init2(int argc, char** argv)
        notalreadyrunning = ami_arexx_init(&rxsig);
 
        /* Treeview init code ends up calling a font function which needs this 
*/
-       glob = &browserglob;
+       ami_gui_set_default_gg();
 
        /* ...and this ensures the treeview at least gets the WB colour palette 
to work with */
        if(scrn == NULL) {
@@ -3080,12 +3085,12 @@ static void gui_quit(void)
 char *ami_gui_get_cache_favicon_name(nsurl *url, bool only_if_avail)
 {
        STRPTR filename = NULL;
-       BPTR lock = 0;
 
        if ((filename = ASPrintf("%s/%x", current_user_faviconcache, 
nsurl_hash(url)))) {
                LOG("favicon cache location: %s", filename);
 
                if (only_if_avail == true) {
+                       BPTR lock = 0;
                        if((lock = Lock(filename, ACCESS_READ))) {
                                UnLock(lock);
                                return filename;
@@ -4413,7 +4418,7 @@ gui_window_create(struct browser_window *bw,
        g->shared->node = AddObject(window_list,AMINS_WINDOW);
        g->shared->node->objstruct = g->shared;
 
-       glob = &browserglob;
+       ami_gui_set_default_gg();
 
        if(locked_screen) {
                UnlockPubScreen(NULL,scrn);
@@ -4865,7 +4870,7 @@ static void ami_do_redraw(struct gui_window_2 *gwin)
                        .plot = &amiplot
                };
 
-               glob = &browserglob;
+               ami_gui_set_default_gg();
 
                if(nsoption_bool(direct_render) == false)
                {
@@ -5563,7 +5568,7 @@ int main(int argc, char** argv)
                        LOG("WARNING: JSIMD_FORCENONE NOT SET");
                        SetVar("JSIMD_FORCENONE", "1", 1, GVF_GLOBAL_ONLY | 
GVF_SAVE_VAR);
                } else {
-                       LOG("JSIMDFORCENONE = %s (NB: Should be '1' for this 
architecture)", jsimd_forcenone);
+                       LOG("JSIMD_FORCENONE = %s (NB: Should be '1' for this 
architecture)", jsimd_forcenone);
                }
        }
 #endif
diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h
index 3addea5..c1513a0 100644
--- a/frontends/amiga/gui.h
+++ b/frontends/amiga/gui.h
@@ -241,5 +241,9 @@ uint32 ami_gui_get_app_id(void);
  */
 STRPTR ami_gui_get_screen_title(void);
 
+/**
+ * Set gui_globals back to the default for the browser context
+ */
+void ami_gui_set_default_gg(void);
 #endif
 
diff --git a/frontends/amiga/history_local.c b/frontends/amiga/history_local.c
index e083496..c87b563 100755
--- a/frontends/amiga/history_local.c
+++ b/frontends/amiga/history_local.c
@@ -89,7 +89,7 @@ static void ami_history_redraw(struct history_window *hw)
        browser_window_history_redraw_rectangle(hw->gw->bw, xs, ys,
                        bbox->Width + xs, bbox->Height + ys, 0, 0, &ctx);
 
-       glob = &browserglob;
+       ami_gui_set_default_gg();
 
        ami_clearclipreg(hw->gg);
        ami_history_update_extent(hw);
diff --git a/frontends/amiga/iff_dr2d.c b/frontends/amiga/iff_dr2d.c
index 966d2a6..aea7738 100644
--- a/frontends/amiga/iff_dr2d.c
+++ b/frontends/amiga/iff_dr2d.c
@@ -78,8 +78,6 @@ bool ami_svg_to_dr2d(struct IFFHandle *iffh, const char 
*buffer,
 {
        struct svgtiny_diagram *diagram;
        svgtiny_code code;
-       unsigned int i;
-       unsigned int j;
        BOOL fons_written = FALSE;
        struct fons_struct *fons;
        struct stxt_struct *stxt;
@@ -156,7 +154,7 @@ bool ami_svg_to_dr2d(struct IFFHandle *iffh, const char 
*buffer,
 
                if(!(PushChunk(iffh,0,ID_CMAP,IFFSIZE_UNKNOWN)))
                {
-                       for (i = 0; i != diagram->shape_count; i++) {
+                       for (unsigned int i = 0; i != diagram->shape_count; 
i++) {
                                if(diagram->shape[i].fill != 
svgtiny_TRANSPARENT)
                                {
                                        addcolour(diagram->shape[i].fill);
@@ -172,7 +170,7 @@ bool ami_svg_to_dr2d(struct IFFHandle *iffh, const char 
*buffer,
                        PopChunk(iffh);
                }
 
-       for (i = 0; i != diagram->shape_count; i++) {
+       for (unsigned int i = 0; i != diagram->shape_count; i++) {
                attr = ami_misc_allocvec_clear(sizeof(struct attr_struct), 0);
                if (diagram->shape[i].fill == svgtiny_TRANSPARENT)
                        attr->FillType = FT_NONE;
@@ -212,7 +210,7 @@ bool ami_svg_to_dr2d(struct IFFHandle *iffh, const char 
*buffer,
                        NumPoints = 0;
                        type = ID_OPLY;
 
-                       for (j = 0;
+                       for (unsigned int j = 0;
                                        j != diagram->shape[i].path_length; ) {
                                switch ((int) diagram->shape[i].path[j]) {
                                        case svgtiny_PATH_MOVE:
diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c
index 9076eea..efb0b09 100644
--- a/frontends/amiga/plotters.c
+++ b/frontends/amiga/plotters.c
@@ -72,7 +72,6 @@ struct bez_point {
        float y;
 };
 
-struct gui_globals browserglob;
 struct gui_globals *glob;
 
 static int init_layers_count = 0;
diff --git a/frontends/amiga/plotters.h b/frontends/amiga/plotters.h
index e027189..7cb994f 100644
--- a/frontends/amiga/plotters.h
+++ b/frontends/amiga/plotters.h
@@ -46,7 +46,6 @@ struct gui_globals
 extern const struct plotter_table amiplot;
 
 extern struct gui_globals *glob;
-extern struct gui_globals browserglob;
 
 void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height, bool 
force32bit);
 void ami_free_layers(struct gui_globals *gg);
diff --git a/frontends/amiga/print.c b/frontends/amiga/print.c
index 56d2570..6926647 100644
--- a/frontends/amiga/print.c
+++ b/frontends/amiga/print.c
@@ -448,7 +448,7 @@ bool ami_print_cont(void)
                glob = ami_print_info.gg;
                print_draw_next_page(&amiprinter, ami_print_info.ps);
                ami_print_dump();
-               glob = &browserglob;
+               ami_gui_set_default_gg();
                ret = true;
        }
        else 
@@ -511,7 +511,7 @@ void ami_print_end(void)
        ami_free_layers(ami_print_info.gg);
        FreeVec(ami_print_info.gg);
        DisposeObject(ami_print_info.objects[OID_MAIN]);
-       glob = &browserglob;
+       ami_gui_set_default_gg();
 
        ami_print_close_device();
        ami_print_free();
diff --git a/frontends/amiga/schedule.c b/frontends/amiga/schedule.c
index e34c000..2d63465 100755
--- a/frontends/amiga/schedule.c
+++ b/frontends/amiga/schedule.c
@@ -38,14 +38,14 @@ struct Device *TimerBase;
 struct TimerIFace *ITimer;
 #endif
 
-static APTR pool_nscb = NULL;
-static APTR pool_timereq = NULL;
+static APTR restrict pool_nscb = NULL;
+static APTR restrict pool_timereq = NULL;
 
 struct nscallback
 {
        struct TimeVal tv;
-       void *callback;
-       void *p;
+       void *restrict callback;
+       void *restrict p;
        struct TimeRequest *treq;
 };
 
diff --git a/frontends/amiga/tree.c b/frontends/amiga/tree.c
index f02fdcd..8328194 100644
--- a/frontends/amiga/tree.c
+++ b/frontends/amiga/tree.c
@@ -262,7 +262,7 @@ static void ami_tree_redraw_req_dr(void *p)
        ami_update_pointer(twin->win, GUI_POINTER_DEFAULT);
        ami_clearclipreg(glob);
        glob->rp = temprp;
-       glob = &browserglob;
+       ami_gui_set_default_gg();
 }
 
 static void ami_tree_redraw_req(void *p)
@@ -345,7 +345,7 @@ static void ami_tree_redraw_req(void *p)
        ami_gui_free_space_box(bbox);
        ami_update_pointer(twin->win, GUI_POINTER_DEFAULT);
        ami_clearclipreg(glob);
-       glob = &browserglob;
+       ami_gui_set_default_gg();
 }
 
 static void ami_tree_redraw_request(int x, int y, int width, int height, void 
*data)


-- 
NetSurf Browser

_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org

Reply via email to