From 813d4c6a36db5164289c07ee75a63e31c2a4bcfd Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel@minix3.org>
Date: Mon, 25 Feb 2013 12:48:26 +0100
Subject: [PATCH] Removing obsolete _MINIX_SOURCE define

Change-Id: I924d5af294cd5daf17c73f71803f060cea3c3d8b
---
 commands/arp/arp.c          | 2 +-
 commands/cron/cron.c        | 3 ---
 commands/stty/stty.c        | 4 ----
 commands/tcpstat/tcpstat.c  | 2 +-
 commands/udpstat/udpstat.c  | 2 +-
 lib/libc/sys-minix/execve.c | 1 -
 man/man2/reboot.2           | 2 +-
 servers/inet/inet.c         | 2 --
 servers/inet/inet_config.c  | 2 --
 servers/lwip/inet_config.c  | 2 +-
 10 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/commands/arp/arp.c b/commands/arp/arp.c
index 7304f15ca..d394c5260 100644
--- a/commands/arp/arp.c
+++ b/commands/arp/arp.c
@@ -7,7 +7,7 @@ Manipulate ARP table
 */
 
 #define _POSIX_C_SOURCE 2
-#define _MINIX_SOURCE
+#define _NETBSD_SOURCE 1
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/commands/cron/cron.c b/commands/cron/cron.c
index 1a09c2f40..53ff88010 100644
--- a/commands/cron/cron.c
+++ b/commands/cron/cron.c
@@ -2,9 +2,6 @@
  *								7 Dec 1996
  */
 
-#define _MINIX_SOURCE
-#define _MINIX 1
-
 #define nil ((void*)0)
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/commands/stty/stty.c b/commands/stty/stty.c
index 309cbc5be..1a14226ce 100644
--- a/commands/stty/stty.c
+++ b/commands/stty/stty.c
@@ -4,10 +4,6 @@
 	Adapted to POSIX 1003.2 by Philip Homburg.
  */
 
-#ifdef __minix_vmd
-#define _MINIX_SOURCE
-#endif
-
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
diff --git a/commands/tcpstat/tcpstat.c b/commands/tcpstat/tcpstat.c
index 23591799f..33c44d196 100644
--- a/commands/tcpstat/tcpstat.c
+++ b/commands/tcpstat/tcpstat.c
@@ -4,8 +4,8 @@ tcpstat.c
 Created:	June 1995 by Philip Homburg <philip@f-mnx.phicoh.com>
 */
 
-#define _MINIX_SOURCE
 #define _POSIX_C_SOURCE 2
+#define _NETBSD_SOURCE 1
 
 #include <inet/inet.h>
 #undef printf
diff --git a/commands/udpstat/udpstat.c b/commands/udpstat/udpstat.c
index 439b0197d..972865b63 100644
--- a/commands/udpstat/udpstat.c
+++ b/commands/udpstat/udpstat.c
@@ -4,8 +4,8 @@ udpstat.c
 Created:	March 2001 by Philip Homburg <philip@f-mnx.phicoh.com>
 */
 
-#define _MINIX_SOURCE
 #define _POSIX_C_SOURCE 2
+#define _NETBSD_SOURCE 1
 
 #include <inet/inet.h>
 #undef printf
diff --git a/lib/libc/sys-minix/execve.c b/lib/libc/sys-minix/execve.c
index dcb84373c..27b350584 100644
--- a/lib/libc/sys-minix/execve.c
+++ b/lib/libc/sys-minix/execve.c
@@ -1,7 +1,6 @@
 /*	execve() - basic program execution call		Author: Kees J. Bot
  *								21 Jan 1994
  */
-#define _MINIX_SOURCE
 
 #include <sys/cdefs.h>
 #include "namespace.h"
diff --git a/man/man2/reboot.2 b/man/man2/reboot.2
index eee86c9b4..f6993f5ee 100644
--- a/man/man2/reboot.2
+++ b/man/man2/reboot.2
@@ -4,7 +4,7 @@ reboot \- close down the system or reboot
 .SH SYNTAX
 .ft B
 .nf
-#define _MINIX_SOURCE 1
+#define _NETBSD_SOURCE 1
 
 #include <unistd.h>
 
diff --git a/servers/inet/inet.c b/servers/inet/inet.c
index 05314080b..adecedf1b 100644
--- a/servers/inet/inet.c
+++ b/servers/inet/inet.c
@@ -35,8 +35,6 @@ from DL_ETH:
 
 #include "inet.h"
 
-#define _MINIX_SOURCE 1
-
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/svrctl.h>
diff --git a/servers/inet/inet_config.c b/servers/inet/inet_config.c
index b9d1e325b..4854970b7 100644
--- a/servers/inet/inet_config.c
+++ b/servers/inet/inet_config.c
@@ -9,8 +9,6 @@ Modified:	Apr 07, 2001 by Kees J. Bot
 Copyright 1995 Philip Homburg
 */
 
-#define _MINIX_SOURCE 1
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/servers/lwip/inet_config.c b/servers/lwip/inet_config.c
index 631df1c72..700542c94 100644
--- a/servers/lwip/inet_config.c
+++ b/servers/lwip/inet_config.c
@@ -9,8 +9,8 @@ Modified:	Apr 07, 2001 by Kees J. Bot
 Copyright 1995 Philip Homburg
 */
 
-#define _MINIX_SOURCE 1
 #define _POSIX_SOURCE 1
+#define _NETBSD_SOURCE 1
 
 #include <stdlib.h>
 #include <unistd.h>