Removing obsolete _MINIX define

Change-Id: Id33ac7e973d1c0e249b690fe44a597474fac6076

test/Makefile

@@ -1,5 +1,5 @@
 DBG=-O0 -g
-CFLAGS+= -Wall -Werror -D_NETBSD_SOURCE -fno-builtin -D_MINIX -D_POSIX_SOURCE
+CFLAGS+= -Wall -Werror -fno-builtin
 LDADD+= -lm -lcompat_minix
 
 # Tests have no manpages

test/blocktest/Makefile.inc

@@ -1,5 +1,4 @@
 # Copied from drivers/Makefile.inc, and slightly edited.
-CPPFLAGS+= -D_MINIX -D_NETBSD_SOURCE
 LDADD+= -lminlib -lcompat_minix -lc
 DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX}
 BINDIR?=/usr/sbin

test/ds/Makefile.inc

@@ -1,5 +1,4 @@
 # Copied from drivers/Makefile.inc
-CPPFLAGS+= -D_MINIX -D_NETBSD_SOURCE
 LDADD+= -lminlib -lcompat_minix
 DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX}
 BINDIR?=/usr/sbin

test/ipc/semctl/Makefile

@@ -1,7 +1,7 @@
 # Makefile for the tests
 
 CC = exec cc
-CFLAGS = -Wall -D_MINIX -D_POSIX_SOURCE -D_NETBSD_SOURCE=1 -I../lib/
+CFLAGS = -Wall -I../lib/
 
 PROG = semctl01 semctl02 semctl03 semctl04 semctl05 semctl06 semctl07
 

test/ipc/semget/Makefile

@@ -1,7 +1,7 @@
 # Makefile for the tests
 
 CC = exec cc
-CFLAGS = -Wall -D_MINIX -D_POSIX_SOURCE -D_NETBSD_SOURCE=1 -I../lib/
+CFLAGS = -Wall -I../lib/
 
 PROG =	semget01 semget02 semget03 semget05 semget06
 

test/ipc/semop/Makefile

@@ -1,7 +1,7 @@
 # Makefile for the tests
 
 CC = exec cc
-CFLAGS = -Wall -D_MINIX -D_POSIX_SOURCE -D_NETBSD_SOURCE=1 -I../lib/
+CFLAGS = -Wall -I../lib/
 
 PROG = semop01 semop02 semop03 semop04 semop05
 

test/ipc/shmat/Makefile

@@ -1,7 +1,7 @@
 # Makefile for the tests
 
 CC = exec cc
-CFLAGS = -Wall -D_MINIX -D_POSIX_SOURCE -D_NETBSD_SOURCE=1 -I../lib/
+CFLAGS = -Wall -I../lib/
 
 PROG =	shmat01 shmat02 shmat03
 

test/ipc/shmctl/Makefile

@@ -1,7 +1,7 @@
 # Makefile for the tests
 
 CC = exec cc
-CFLAGS = -Wall -D_MINIX -D_POSIX_SOURCE -D_NETBSD_SOURCE=1 -I../lib/
+CFLAGS = -Wall -I../lib/
 
 PROG =	shmctl01 shmctl02 shmctl03 shmctl04
 

test/ipc/shmdt/Makefile

@@ -1,7 +1,7 @@
 # Makefile for the tests
 
 CC = exec cc
-CFLAGS = -Wall -D_MINIX -D_POSIX_SOURCE -D_NETBSD_SOURCE=1 -I../lib/
+CFLAGS = -Wall -I../lib/
 
 PROG =	shmdt01 shmdt02
 

test/ipc/shmget/Makefile

@@ -1,7 +1,7 @@
 # Makefile for the tests
 
 CC = exec cc
-CFLAGS = -Wall -D_MINIX -D_POSIX_SOURCE -D_NETBSD_SOURCE=1 -I../lib/
+CFLAGS = -Wall -I../lib/
 
 PROG =	shmget01 shmget02 shmget04 shmget05
 

test/ipc/shmt/Makefile

@@ -1,7 +1,7 @@
 # Makefile for the tests
 
 CC = exec cc
-CFLAGS = -Wall -D_MINIX -D_POSIX_SOURCE -D_NETBSD_SOURCE=1 -I../lib/
+CFLAGS = -Wall -I../lib/
 
 PROG =	shmt02 shmt03 shmt04 shmt05 shmt06 \
 	shmt07 shmt08 shmt10 shmt01

test/kernel/sys_vumap/Makefile.inc

@@ -1,5 +1,4 @@
 # Copied from drivers/Makefile.inc
-CPPFLAGS+= -D_MINIX -D_NETBSD_SOURCE
 LDADD+= -lminlib -lcompat_minix
 DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX}
 BINDIR?=/usr/sbin

test/safecopy/inc.h

@@ -1,5 +1,6 @@
-#define _SYSTEM
-#define _MINIX
+
+#define _SYSTEM		1
+
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>

test/scancodes/test-scancodes.c

@@ -1,5 +1,3 @@
-#define _MINIX
-
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>

test/select/Makefile

@@ -1,7 +1,7 @@
 # Makefile for the tests
 
 CC = exec cc
-CFLAGS = -Wall -D_MINIX -D_POSIX_SOURCE
+CFLAGS = -Wall
 
 PROG =	speed test00 test01 test02 test03 test04_srv test04_cli test05_srv \
         test05_cli test06_srv test06_cli test07_srv test07_cli test08_srv \

test/t40e.c

@@ -158,7 +158,7 @@ void do_child(int childno) {
 #endif
 
   /* Normally we'd zerofill sin_zero, but there is no such thing on Minix */
-#ifndef _MINIX
+#if !defined(__minix)
   memset(server.sin_zero, '\0', sizeof server.sin_zero);
 #endif
 
@@ -219,7 +219,7 @@ void do_child(int childno) {
 }
 
 void do_parent(void) {
-#ifndef _MINIX
+#if !defined(__minix)
   int yes = 1;
 #endif
   int fd_sock, fd_new, exitstatus;
@@ -242,12 +242,12 @@ void do_parent(void) {
   my_addr.sin_port = htons(MYPORT); /* Short, network byte order */
   my_addr.sin_addr.s_addr = INADDR_ANY;
   /* Normally we'd zerofill sin_zero, but there is no such thing on Minix */
-#ifndef _MINIX
+#if !defined(__minix)
   memset(my_addr.sin_zero, '\0', sizeof my_addr.sin_zero);
 #endif
   
   /* Reuse port number. Not implemented in Minix. */
-#ifndef _MINIX
+#if !defined(__minix)
   if(setsockopt(fd_sock, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)) < 0) {
     perror("Error setting port reuse option");
     exit(-1);

test/test27.c

@@ -123,7 +123,7 @@ void test27a()
   /* Check special file. */
   if (stat("/dev/tty", &st1) != 0) e(40);
   if (!S_ISCHR(st1.st_mode)) e(41);
-#ifdef _MINIX
+#if defined(__minix) && defined(_NETBSD_SOURCE)
   if (stat("/dev/ram", &st1) != 0) e(42);
   if (!S_ISBLK(st1.st_mode)) e(43);
 #endif

test/test28.c

@@ -231,7 +231,7 @@ void test28b()
 	if (errno != ENOENT) e(38);	/* is gone */
   }
 #endif
-#ifdef _MINIX
+#if defined(__minix) && defined(_NETBSD_SOURCE)
   /* Some implementations might allow users to link directories. */
   if (!superuser) {
 	if (link("foo", "footoo") != -1) e(39);

test/test42.c

@@ -1,5 +1,4 @@
 /* Tests for MINIX3 ptrace(2) - by D.C. van Moolenbroek */
-#define _POSIX_SOURCE 1
 #include <setjmp.h>
 #include <stdlib.h>
 #include <stdio.h>

test/test43.c

@@ -1,5 +1,4 @@
 /* Tests for MINIX3 realpath(3) - by Erik van der Kouwe */
-#define _POSIX_SOURCE 1
 #include <assert.h>
 #include <dirent.h>
 #include <errno.h>

test/test50.c

@@ -1,5 +1,4 @@
 /* Tests for truncate(2) call family - by D.C. van Moolenbroek */
-#define _POSIX_SOURCE 1
 #include <sys/stat.h>
 #include <sys/param.h>
 #include <unistd.h>

test/test52.c

@@ -1,4 +1,3 @@
-#define _POSIX_SOURCE 1
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>