From: Ben Gras <ben@minix3.org>
Date: Wed, 13 Jul 2011 12:37:48 +0000 (+0200)
Subject: don't declare closefrom()
X-Git-Tag: v3.2.0~465
X-Git-Url: http://zhaoyanbai.com/repos/%22../static/icons/mandoc.1.ps?a=commitdiff_plain;h=6c9aa8a9ca53df43f89eda74ae9073ab6d68717a;p=minix.git

don't declare closefrom()
Please enter the commit message for your changes. Lines starting
---

diff --git a/nbsd_include/minix-port.patch b/nbsd_include/minix-port.patch
index 8928d1cd6..0c77f7d38 100644
--- a/nbsd_include/minix-port.patch
+++ b/nbsd_include/minix-port.patch
@@ -479,7 +479,7 @@ diff -ru nbsdsrc/src/include/unistd.h nbsd_include/unistd.h
  
  #ifndef __AUDIT__
  char	*getwd(char *);				/* obsoleted by getcwd() */
-@@ -295,8 +309,14 @@
+@@ -295,9 +309,15 @@
  /*
   * Implementation-defined extensions
   */
@@ -490,10 +490,11 @@ diff -ru nbsdsrc/src/include/unistd.h nbsd_include/unistd.h
  #if defined(_NETBSD_SOURCE)
 +#ifndef __minix
  int	 acct(const char *);
-+#endif /* !__minix */
  int	 closefrom(int);
++#endif /* !__minix */
  int	 des_cipher(const char *, char *, long, int);
  int	 des_setkey(const char *);
+ void	 endusershell(void);
 @@ -315,15 +335,23 @@
  int	 iruserok(uint32_t, int, const char *, const char *);
  int      issetugid(void);
diff --git a/nbsd_include/unistd.h b/nbsd_include/unistd.h
index 7b10c6bea..d93a15ff1 100644
--- a/nbsd_include/unistd.h
+++ b/nbsd_include/unistd.h
@@ -316,8 +316,8 @@ int lseek64(int fd, u64_t _offset, int _whence, u64_t *_newpos);
 #if defined(_NETBSD_SOURCE)
 #ifndef __minix
 int	 acct(const char *);
-#endif /* !__minix */
 int	 closefrom(int);
+#endif /* !__minix */
 int	 des_cipher(const char *, char *, long, int);
 int	 des_setkey(const char *);
 void	 endusershell(void);