Merge branch 'master' of git://git.netsurf-browser.org/netsurf

This commit is contained in:
Chris Young 2015-02-02 00:33:23 +00:00
commit 54a966f6ff
4 changed files with 10 additions and 4 deletions

View File

@ -37,5 +37,5 @@ NETSURF_USE_NSSVG := YES
NETSURF_USE_JS := NO
# Optimisation levels
CFLAGS += -gstabs
CFLAGS += -fomit-frame-pointer -gstabs

View File

@ -5,9 +5,9 @@
CFLAGS += -std=c99 -Dnsamiga
ifneq ($(SUBTARGET),os3)
CFLAGS += -O2 -U__STRICT_ANSI__ -D__USE_INLINE__ -D__USE_BASETYPE__
CFLAGS += -O2 -finline-functions -U__STRICT_ANSI__ -D__USE_INLINE__ -D__USE_BASETYPE__
else
CFLAGS += -O0 -DPATH_MAX=1024
CFLAGS += -m68020 -O0 -DPATH_MAX=1024
endif
NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE

View File

@ -192,6 +192,12 @@ struct Node *GetHead(struct List *list)
return res;
}
struct Node *GetPred(struct Node *node)
{
if (node->ln_Pred->ln_Pred == NULL) return NULL;
return node->ln_Pred;
}
struct Node *GetSucc(struct Node *node)
{
if (node->ln_Succ->ln_Succ == NULL) return NULL;

View File

@ -144,7 +144,6 @@
/* Exec */
#define AllocVecTagList(SZ,TAG) AllocVec(SZ,MEMF_ANY) /* AllocVecTagList with no tags */
#define FindIName FindName
#define GetPred(N) N ? (N)->ln_Pred : NULL
/* Gfx */
#define SetRPAttrs(...) (void)0 /*\todo Probably need to emulate this */
@ -240,6 +239,7 @@ void FreeSysObject(ULONG type, APTR obj);
/* Exec */
struct Node *GetHead(struct List *list);
struct Node *GetPred(struct Node *node);
struct Node *GetSucc(struct Node *node);
/* Intuition */