3 files changed, 20 insertions, 8 deletions
diff --git a/winsup/cygwin/include/sys/acl.h b/winsup/cygwin/include/sys/acl.h
index 74e50ba..5789dd0 100644
--- a/winsup/cygwin/include/sys/acl.h
+++ b/winsup/cygwin/include/sys/acl.h
@@ -92,6 +92,18 @@ extern ssize_t	acl_size (acl_t __acl);
 extern char    *acl_to_text (acl_t __acl, ssize_t *__len_p);
 extern int	acl_valid (acl_t __acl);
 
+/* Non-libacl extensions to POSIX.1e draft 17 */
+
+/* FreeBSD, NetBSD */
+extern acl_t	acl_get_fd_np (int __fd, acl_type_t __type);
+extern acl_t	acl_get_link_np (const char *__path_p, acl_type_t __type);
+extern int	acl_get_perm_np (acl_permset_t __permset_d, acl_perm_t __perm);
+extern int	acl_is_trivial_np (const acl_t __acl, int *__trivialp);
+extern int	acl_set_fd_np (int __fd, acl_t __acl, acl_type_t __type);
+extern int	acl_set_link_np (const char *__path_p, acl_type_t __type,
+				 acl_t __acl);
+extern acl_t	acl_strip_np (const acl_t __acl, int __recalculate_mask);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/winsup/cygwin/include/sys/poll.h b/winsup/cygwin/include/sys/poll.h
index 65822ed..5d58b36 100644
--- a/winsup/cygwin/include/sys/poll.h
+++ b/winsup/cygwin/include/sys/poll.h
@@ -39,7 +39,7 @@ struct pollfd {
 typedef unsigned int nfds_t;
 
 extern int poll __P ((struct pollfd *fds, nfds_t nfds, int timeout));
-#if __GNU_VISIBLE
+#if __GNU_VISIBLE || __POSIX_VISIBLE >= 202405
 extern int ppoll __P ((struct pollfd *fds, nfds_t nfds,
 		       const struct timespec *timeout_ts,
 		       const sigset_t *sigmask));
diff --git a/winsup/cygwin/include/sys/termios.h b/winsup/cygwin/include/sys/termios.h
index d1b4a0a..6cd6407 100644
--- a/winsup/cygwin/include/sys/termios.h
+++ b/winsup/cygwin/include/sys/termios.h
@@ -18,6 +18,7 @@ details. */
 #define	TIOCMBIC	0x5417
 #define	TIOCMSET	0x5418
 #define	TIOCINQ		0x541B
+#define TCXONC		0x540A
 #define TIOCSCTTY	0x540E
 
 /* TIOCINQ is utilized instead of FIONREAD which has been
@@ -282,6 +283,12 @@ struct termios
   speed_t	c_ospeed;
 };
 
+struct winsize
+{
+  unsigned short ws_row, ws_col;
+  unsigned short ws_xpixel, ws_ypixel;
+};
+
 #define termio termios
 
 #ifdef __cplusplus
@@ -313,13 +320,6 @@ int tcsetwinsize(int fd, const struct winsize *winsz);
 #define cfgetospeed(tp)		((tp)->c_ospeed)
 #endif
 
-/* Extra stuff to make porting stuff easier.  */
-struct winsize
-{
-  unsigned short ws_row, ws_col;
-  unsigned short ws_xpixel, ws_ypixel;
-};
-
 #define TIOCGWINSZ (('T' << 8) | 1)
 #define TIOCSWINSZ (('T' << 8) | 2)
 #define TIOCLINUX  (('T' << 8) | 3)