Merge remote-tracking branch 'origin/master' into devel-11

7 files changed, 34 insertions, 15 deletions

diff --git a/include/dirent.h b/include/dirent.h
index b894bb8..1ab949c 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -38,15 +38,23 @@
  * the getdirentries(2) system call.
  */
 #include <sys/cdefs.h>
+#include <sys/_types.h>
 #include <sys/dirent.h>
 
 #if __XSI_VISIBLE
+
+#ifndef _INO_T_DECLARED
+typedef	__ino_t		ino_t;
+#define	_INO_T_DECLARED
+#endif
+
 /*
  * XXX this is probably illegal in the __XSI_VISIBLE case, but brings us closer
  * to the specification.
  */
 #define	d_ino		d_fileno	/* backward and XSI compatibility */
-#endif
+
+#endif /* __XSI_VISIBLE */
 
 #if __BSD_VISIBLE
 
diff --git a/include/libgen.h b/include/libgen.h
index 0d4472f..28c0067 100644
--- a/include/libgen.h
+++ b/include/libgen.h
@@ -29,22 +29,14 @@
  */
 
 #ifndef _LIBGEN_H_
-#define _LIBGEN_H_
+#define	_LIBGEN_H_
 
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-
 char	*basename(const char *);
 char	*basename_r(const char *, char *);
 char	*dirname(const char *);
-#if 0
-char	*regcmp(const char *, ...);
-char	*regex(const char *, const char *, ...);
-
-extern char *__loc1;
-#endif
-
 __END_DECLS
 
-#endif /* _LIBGEN_H_ */
+#endif /* !_LIBGEN_H_ */
diff --git a/include/monetary.h b/include/monetary.h
index 93f82c1..bca607a 100644
--- a/include/monetary.h
+++ b/include/monetary.h
@@ -43,7 +43,7 @@ typedef	__ssize_t	ssize_t;
 #endif
 
 __BEGIN_DECLS
-#ifdef _XLOCALE_H_
+#if __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_)
 #include <xlocale/_monetary.h>
 #endif
 ssize_t	strfmon(char * __restrict, size_t, const char * __restrict, ...);
diff --git a/include/ndbm.h b/include/ndbm.h
index 0acb6a6..db83803 100644
--- a/include/ndbm.h
+++ b/include/ndbm.h
@@ -52,7 +52,7 @@
 #define	DBM_SUFFIX	".db"
 
 typedef struct {
-	char *dptr;
+	void *dptr;
 	int dsize;
 } datum;
 
@@ -70,7 +70,7 @@ datum	 dbm_firstkey(DBM *);
 long	 dbm_forder(DBM *, datum);
 #endif
 datum	 dbm_nextkey(DBM *);
-DBM	*dbm_open(const char *, int, int);
+DBM	*dbm_open(const char *, int, mode_t);
 int	 dbm_store(DBM *, datum, datum, int);
 #if __BSD_VISIBLE
 int	 dbm_dirfno(DBM *);
diff --git a/include/netdb.h b/include/netdb.h
index a73d2af..3fa5ff3 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -60,6 +60,16 @@
 #include <sys/cdefs.h>
 #include <sys/_types.h>
 
+#ifndef _IN_ADDR_T_DECLARED
+typedef	__uint32_t	in_addr_t;
+#define	_IN_ADDR_T_DECLARED
+#endif
+
+#ifndef _IN_PORT_T_DECLARED
+typedef	__uint16_t	in_port_t;
+#define	_IN_PORT_T_DECLARED
+#endif
+
 #ifndef _SIZE_T_DECLARED
 typedef	__size_t	size_t;
 #define	_SIZE_T_DECLARED
@@ -131,6 +141,8 @@ struct addrinfo {
 	struct	addrinfo *ai_next;	/* next structure in linked list */
 };
 
+#define	IPPORT_RESERVED	1024
+
 /*
  * Error return codes from gethostbyname() and gethostbyaddr()
  * (left in h_errno).
diff --git a/include/signal.h b/include/signal.h
index 217fadd..9f33fb6 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -113,7 +113,7 @@ int	siginterrupt(int, int);
 #endif
 
 #if __POSIX_VISIBLE >= 200809
-void	psignal(unsigned int, const char *);
+void	psignal(int, const char *);
 #endif
 
 #if __BSD_VISIBLE
diff --git a/include/wchar.h b/include/wchar.h
index 84a4a97..26d257a 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -76,6 +76,13 @@ typedef	__size_t	size_t;
 #define	_SIZE_T_DECLARED
 #endif
 
+#if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE
+#ifndef _VA_LIST_DECLARED
+typedef	__va_list	va_list;
+#define	_VA_LIST_DECLARED
+#endif
+#endif
+
 #ifndef	__cplusplus
 #ifndef _WCHAR_T_DECLARED
 typedef	___wchar_t	wchar_t;