Removing obsolete _MINIX define

Change-Id: Id33ac7e973d1c0e249b690fe44a597474fac6076

sys/arch/arm/include/signal.h

@@ -50,10 +50,10 @@ struct sigcontext {
 #define sc_pc sc_regs.pc
 #define sc_psr sc_regs.psr
 
-#ifdef _MINIX
+#if defined(__minix) && defined(_NETBSD_SOURCE)
 __BEGIN_DECLS
 int sigreturn(struct sigcontext *_scp);
 __END_DECLS
-#endif /* _MINIX */
+#endif /* defined(__minix) && defined(_NETBSD_SOURCE) */
 
 #endif	/* !_ARM_SIGNAL_H_ */

sys/arch/i386/include/signal.h

@@ -54,10 +54,10 @@ struct sigcontext {
 #define sc_sp sc_regs.sp
 #define sc_ss sc_regs.ss
 
-#ifdef _MINIX
+#if defined(__minix) && defined(_NETBSD_SOURCE)
 __BEGIN_DECLS
 int sigreturn(struct sigcontext *_scp); 
 __END_DECLS
-#endif /* _MINIX */
+#endif /* defined(__minix) && defined(_NETBSD_SOURCE) */
 
 #endif	/* !_I386_SIGNAL_H_ */

sys/arch/i386/stand/boot/Makefile.boot

@@ -38,7 +38,6 @@ CPPFLAGS+= -I ${.CURDIR}/..  -I ${.CURDIR}/../../lib -I ${S}/lib/libsa
 CPPFLAGS+= -I ${.OBJDIR}
 .if defined(__MINIX)
 CPPFLAGS+=-isystem ${DESTDIR}/usr/include
-CPPFLAGS+= -D_MINIX
 .endif # defined(__MINIX)
 # Make sure we override any optimization options specified by the user
 COPTS=  -Os

sys/arch/i386/stand/bootxx/Makefile.bootxx

@@ -116,7 +116,6 @@ SAMISCMAKEFLAGS+="SA_USE_LOADFILE=yes"
 .if defined(__MINIX)
 SAMISCMAKEFLAGS+="SA_INCLUDE_NET=no"
 CPPFLAGS+= -isystem ${DESTDIR}/usr/include
-CPPFLAGS+= -D_MINIX
 AFLAGS+=       -Wa,--divide
 .endif
 .include "${S}/lib/libsa/Makefile.inc"

sys/sys/select.h

@@ -75,13 +75,13 @@ int	select(int, fd_set * __restrict, fd_set * __restrict,
 __END_DECLS
 #endif /* _KERNEL */
 
-#ifdef _MINIX
+#if defined(__minix) && defined(_NETBSD_SOURCE)
 /* possible select() operation types; read, write, errors */
 /* (FS/driver internal use only) */
 #define SEL_RD		(1 << 0)
 #define SEL_WR		(1 << 1)
 #define SEL_ERR		(1 << 2)
 #define SEL_NOTIFY	(1 << 3) /* not a real select operation */
-#endif
+#endif /* defined(__minix) && defined(_NETBSD_SOURCE) */
 
 #endif /* !_SYS_SELECT_H_ */

sys/sys/signal.h

@@ -77,7 +77,7 @@
 #define SIGTTIN           22	/* background process wants to read */
 #define SIGTTOU           23	/* background process wants to write */
 
-#ifdef _MINIX
+#if defined(__minix) && defined(_NETBSD_SOURCE)
 #define SIGIOT             SIGABRT /* for people who speak PDP-11 */
 
 /* MINIX specific signals. These signals are not used by user proceses, 
@@ -110,7 +110,7 @@
     || (sig == SIGKILL || sig == SIGPIPE))
 #define SIGS_IS_STACKTRACE(sig) (SIGS_IS_LETHAL(sig) && sig != SIGABRT)
 
-#endif
+#endif /* defined(__minix) && deinfed(_NETBSD_SOURCE) */
 
 #ifndef _KERNEL
 #include <sys/cdefs.h>

sys/sys/types.h

@@ -115,7 +115,7 @@ typedef u32_t		big_nlink_t;
 typedef u32_t		big_uid_t;
 
 
-#ifdef _MINIX
+#ifdef _NETBSD_SOURCE
 /* some Minix specific types that do not conflict with posix */
 typedef uint32_t zone_t;      /* zone number */
 typedef uint32_t block_t;     /* block number */