From: Ben Gras <ben@minix3.org>
Date: Wed, 9 Jun 2010 12:03:19 +0000 (+0000)
Subject: includes: minix <util.h>
X-Git-Tag: v3.1.8~480
X-Git-Url: http://zhaoyanbai.com/repos/%22/xml/v3/zones/static/man.host.html?a=commitdiff_plain;h=d7490d374d2d587e3cbdcee556f6bbdef2616d8c;p=minix.git

includes: minix <util.h>
---

diff --git a/include/Makefile b/include/Makefile
index e9f711b41..bb869cbd7 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -9,7 +9,7 @@ INCS=	alloca.h ansi.h a.out.h ar.h assert.h configfile.h ctype.h \
 	stdint.h stdio.h stdlib.h string.h strings.h sysexits.h \
 	syslog.h tar.h termcap.h termios.h time.h timers.h tools.h \
 	ttyent.h ucontext.h unistd.h utime.h utmp.h wchar.h wctype.h \
-	hgfs.h tzfile.h
+	hgfs.h tzfile.h util.h
 INCS+=	arpa/inet.h
 INCS+=	minix/a.out.h minix/bitmap.h minix/callnr.h minix/cdrom.h \
 	minix/com.h minix/config.h minix/const.h minix/cpufeature.h \
diff --git a/include/util.h b/include/util.h
index cf59158cf..69f7cabd4 100644
--- a/include/util.h
+++ b/include/util.h
@@ -33,14 +33,11 @@
 #define	_UTIL_H_
 
 #include <sys/cdefs.h>
-#include <sys/ttycom.h>
 #include <sys/types.h>
 #include <stdio.h>
 #include <pwd.h>
 #include <termios.h>
 #include <utmp.h>
-#include <utmpx.h>
-#include <machine/ansi.h>
 
 #ifdef  _BSD_TIME_T_
 typedef _BSD_TIME_T_    time_t;
@@ -55,6 +52,7 @@ typedef _BSD_TIME_T_    time_t;
 #define	PW_POLICY_BYGROUP	2
 
 __BEGIN_DECLS
+#ifndef __minix
 struct disklabel;
 struct iovec;
 struct passwd;
@@ -117,6 +115,8 @@ int		ttyunlock(const char *);
 uint16_t	disklabel_dkcksum(struct disklabel *);
 int		disklabel_scan(struct disklabel *, char *, size_t);
 
+#endif
+
 /* Error checked functions */
 void		(*esetfunc(void (*)(int, const char *, ...)))
     (int, const char *, ...);
@@ -127,12 +127,15 @@ char 		*estrndup(const char *, size_t);
 void 		*ecalloc(size_t, size_t);
 void 		*emalloc(size_t);
 void 		*erealloc(void *, size_t);
-struct __sFILE	*efopen(const char *, const char *);
+FILE		*efopen(const char *, const char *);
+
+#ifndef __minix
 int	 	easprintf(char ** __restrict, const char * __restrict, ...)
     __attribute__((__format__(__printf__, 2, 3)));
 int		evasprintf(char ** __restrict, const char * __restrict,
     _BSD_VA_LIST_)
     __attribute__((__format__(__printf__, 2, 0)));
+#endif
 __END_DECLS
 
 #endif /* !_UTIL_H_ */