From: Arun Thomas <arun@minix3.org>
Date: Sat, 21 Aug 2010 13:07:25 +0000 (+0000)
Subject: easprintf() and evasprintf()
X-Git-Tag: v3.1.8~59
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zlib_tech.html?a=commitdiff_plain;h=60a71efca827d4c10b4d5e3efccdad893f32e344;p=minix.git

easprintf() and evasprintf()
---

diff --git a/include/util.h b/include/util.h
index 69f7cabd4..bf8ec2d86 100644
--- a/include/util.h
+++ b/include/util.h
@@ -129,13 +129,11 @@ void 		*emalloc(size_t);
 void 		*erealloc(void *, size_t);
 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_ */
diff --git a/lib/libutil/efun.c b/lib/libutil/efun.c
index 175e7c602..ef2c1b386 100644
--- a/lib/libutil/efun.c
+++ b/lib/libutil/efun.c
@@ -139,7 +139,6 @@ efopen(const char *p, const char *m)
 	return fp;
 }
 
-#ifndef _MINIX
 int
 easprintf(char ** __restrict ret, const char * __restrict format, ...)
 {
@@ -160,4 +159,3 @@ evasprintf(char ** __restrict ret, const char * __restrict format, va_list ap)
 		(*efunc)(1, "Cannot format string");
 	return rv;
 }
-#endif