emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch from Tito to fix warnings about redifined functionions barrier and likely.

Browse Source
This commit is contained in:
Glenn L McGrath 2004-08-06 01:49:04 +00:00
parent 12ed333714
commit 2f325a030b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
shell/ash.c
View File

@ -212,24 +212,24 @@ static volatile sig_atomic_t pendingsigs;
* more fun than worrying about efficiency and portability. :-)) * more fun than worrying about efficiency and portability. :-))
*/ */
#define barrier() ({ __asm__ __volatile__ ("": : :"memory"); }) #define xbarrier() ({ __asm__ __volatile__ ("": : :"memory"); })
#define INTOFF \ #define INTOFF \
({ \ ({ \
suppressint++; \ suppressint++; \
barrier(); \ xbarrier(); \
0; \ 0; \
}) })
#define SAVEINT(v) ((v) = suppressint) #define SAVEINT(v) ((v) = suppressint)
#define RESTOREINT(v) \ #define RESTOREINT(v) \
({ \ ({ \
barrier(); \ xbarrier(); \
if ((suppressint = (v)) == 0 && intpending) onint(); \ if ((suppressint = (v)) == 0 && intpending) onint(); \
0; \ 0; \
}) })
#define EXSIGON() \ #define EXSIGON() \
({ \ ({ \
exsig++; \ exsig++; \
barrier(); \ xbarrier(); \
if (pendingsigs) \ if (pendingsigs) \
exraise(EXSIG); \ exraise(EXSIG); \
0; \ 0; \
@ -263,13 +263,13 @@ static void forceinton(void)
#else #else
#define INTON \ #define INTON \
({ \ ({ \
barrier(); \ xbarrier(); \
if (--suppressint == 0 && intpending) onint(); \ if (--suppressint == 0 && intpending) onint(); \
0; \ 0; \
}) })
#define FORCEINTON \ #define FORCEINTON \
({ \ ({ \
barrier(); \ xbarrier(); \
suppressint = 0; \ suppressint = 0; \
if (intpending) onint(); \ if (intpending) onint(); \
0; \ 0; \
@ -624,7 +624,7 @@ static const char homestr[] = "HOME";
#define __builtin_expect(x, expected_value) (x) #define __builtin_expect(x, expected_value) (x)
#endif #endif
#define likely(x) __builtin_expect((x),1) #define xlikely(x) __builtin_expect((x),1)
#define TEOF 0 #define TEOF 0
@ -7084,7 +7084,7 @@ growjobtab(void)
jq--; jq--;
#define joff(p) ((struct job *)((char *)(p) + l)) #define joff(p) ((struct job *)((char *)(p) + l))
#define jmove(p) (p) = (void *)((char *)(p) + offset) #define jmove(p) (p) = (void *)((char *)(p) + offset)
if (likely(joff(jp)->ps == &jq->ps0)) if (xlikely(joff(jp)->ps == &jq->ps0))
jmove(joff(jp)->ps); jmove(joff(jp)->ps);
if (joff(jp)->prev_job) if (joff(jp)->prev_job)
jmove(joff(jp)->prev_job); jmove(joff(jp)->prev_job);
@ -11813,7 +11813,7 @@ dotrap(void)
savestatus = exitstatus; savestatus = exitstatus;
q = gotsig; q = gotsig;
while (pendingsigs = 0, barrier(), (p = memchr(q, 1, NSIG - 1))) { while (pendingsigs = 0, xbarrier(), (p = memchr(q, 1, NSIG - 1))) {
*p = 0; *p = 0;
p = trap[p - q + 1]; p = trap[p - q + 1];
if (!p) if (!p)