From: Jean-Baptiste Boric <jblbeurope@gmail.com>
Date: Sun, 13 Mar 2016 18:30:35 +0000 (+0100)
Subject: Revert "libutil: add getmaxpartitions() implementation"
X-Git-Url: http://zhaoyanbai.com/repos/Bv9ARM.ch11.html?a=commitdiff_plain;h=135965dc20d4d7bb45af872ddf476eca4db018bd;p=minix.git

Revert "libutil: add getmaxpartitions() implementation"

This reverts commit 22ad44d6a9fa80d47806bf1897394569b6c15b8a.

With the MIB service implemented, this hack is no longer necessary.

Change-Id: Ic969c2dcecd6fc9ce283d1dda6518796869875e3
---

diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index de36cd6ed..af15de727 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -13,7 +13,7 @@ CPPFLAGS+=-DLIBC_SCCS -I${.CURDIR}
 LINTFLAGS+=-w
 SRCS+=	efun.c \
 	\
-	getfsspecname.c getmntopts.c \
+	getfsspecname.c getmntopts.c getmaxpartitions.c \
 	\
 	\
 	login.c loginx.c login_cap.c login_tty.c logout.c logoutx.c \
@@ -35,10 +35,6 @@ MAN=	efun.3 \
 	snprintb.3 sockaddr_snprintf.3 stat_flags.3 strpct.3 ttyaction.3 \
 	ttymsg.3 util.3
 
-.if defined(__MINIX)
-.include "${NETBSDSRCDIR}/minix/lib/libutil/Makefile.inc"
-.endif
-
 YPREFIX=__pd
 .PATH:	${NETBSDSRCDIR}/lib/libc/gen
 
diff --git a/minix/lib/libutil/Makefile.inc b/minix/lib/libutil/Makefile.inc
deleted file mode 100644
index 9de835068..000000000
--- a/minix/lib/libutil/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-.PATH:	${NETBSDSRCDIR}/minix/lib/libutil
-
-SRCS+= 	getmaxpartitions.c
\ No newline at end of file
diff --git a/minix/lib/libutil/getmaxpartitions.c b/minix/lib/libutil/getmaxpartitions.c
deleted file mode 100644
index d15420423..000000000
--- a/minix/lib/libutil/getmaxpartitions.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <machine/partition.h>
-
-int getmaxpartitions(void)
-{
-	return NR_PARTITIONS;
-}