sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

tests: fix IPC test set fix

Browse source 
Partial rollback of git-df39752.
This commit is contained in:
David van Moolenbroek 2012-10-10 20:10:14 +02:00
parent 420dfe1145
commit 52cf951fdc
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/ipc/shmt/shmt01.c
View file

@ -59,7 +59,7 @@ int main(void)
/* are we doing with ia64 or arm_arch_4t arch */
#if defined (__ia64__) || defined (__ARM_ARCH_4T__) || defined(__minix)
#if defined (__ia64__) || defined (__ARM_ARCH_4T__)
cp = (char *) shmat(shmid, (void *)NULL, 0);
#else
cp = (char *) shmat(shmid, (void *)0x80000, 0);

2
test/ipc/shmt/shmt02.c
View file

@ -81,7 +81,7 @@ int main(void)
/* are we doing with ia64 or arm_arch_4t arch */
#if defined (__ia64__) || defined (__ARM_ARCH_4T__) || defined(__minix)
#if defined (__ia64__) || defined (__ARM_ARCH_4T__)
cp = (char *) shmat(shmid, (void *)NULL, 0);
#else
cp = (char *) shmat(shmid, (void *)0x80000, 0);

4
test/ipc/shmt/shmt04.c
View file

@ -109,7 +109,7 @@ if ((shmid = shmget(key, SIZE, IPC_CREAT|0666)) < 0 ) {
else {
#ifdef __ia64__
cp = (char *) shmat(shmid, ADDR1, 0);
#elif defined(__ARM_ARCH_4T__) || defined(__minix)
#elif defined(__ARM_ARCH_4T__)
cp = (char *) shmat(shmid, NULL, 0);
#else
cp = (char *) shmat(shmid, ADDR, 0);
@ -187,7 +187,7 @@ else
{
#ifdef __ia64__
cp = (char *) shmat(shmid, ADDR1, 0);
#elif defined(__ARM_ARCH_4T__) || defined(__minix)
#elif defined(__ARM_ARCH_4T__)
cp = (char *) shmat(shmid, NULL, 0);
#else
cp = (char *) shmat(shmid, ADDR, 0);

2
test/ipc/shmt/shmt05.c
View file

@ -88,7 +88,7 @@ int main(void)
} else {
#ifdef __ia64__
cp = (char *) shmat(shmid, ADDR_IA, 0);
#elif defined(__ARM_ARCH_4T__) || defined(__minix)
#elif defined(__ARM_ARCH_4T__)
cp = (char *) shmat(shmid, (void *)NULL, 0);
#else
cp = (char *) shmat(shmid, ADDR, 0);

4
test/ipc/shmt/shmt06.c
View file

@ -109,7 +109,7 @@ int main(void)
else {
#ifdef __ia64__
cp = (char *) shmat(shmid, ADDR_IA, 0);
#elif defined(__ARM_ARCH_4T__) || defined(__minix)
#elif defined(__ARM_ARCH_4T__)
cp = (char *) shmat(shmid, (void*) NULL, 0);
#elif defined(__mips__)
cp = (char *) shmat(shmid, ADDR_MIPS, 0);
@ -185,7 +185,7 @@ int child(void)
else {
#ifdef __ia64__
cp = (char *) shmat(shmid, ADDR1_IA, 0);
#elif defined(__ARM_ARCH_4T__) || defined(__minix)
#elif defined(__ARM_ARCH_4T__)
cp = (char *) shmat(shmid, (void *) NULL, 0);
#elif defined(__mips__)
cp = (char *) shmat(shmid, ADDR1_MIPS, 0);

2
test/ipc/shmt/shmt07.c
View file

@ -84,7 +84,7 @@ int main(void)
#ifdef __ia64__
cp = (char *) shmat(shmid, ADDR_IA, 0);
#elif defined(__ARM_ARCH_4T__) || defined(__minix)
#elif defined(__ARM_ARCH_4T__)
cp = (char *) shmat(shmid, (void *) NULL, 0);
#else
cp = (char *) shmat(shmid, ADDR, 0);