Cleanup support for ancient QNX versions

* ACE/ace/config-qnx.h: * ACE/ace/os_include/sys/os_select.h:
jwillemsen · Oct 27, 2023 · 9a2c01c · 9a2c01c
1 parent d7cf8b9
commit 9a2c01c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 19 deletions.
diff --git a/ACE/ace/config-qnx.h b/ACE/ace/config-qnx.h
@@ -114,19 +114,9 @@
 #define ACE_HAS_SYSCTL
 #define ACE_HAS_SIGACTION_CONSTP2 1
 #define ACE_LACKS_PTHREAD_SCOPE_PROCESS
-
-#if _NTO_VERSION < 650
-# define ACE_LACKS_NFDBITS
-# define ACE_LACKS_FD_MASK
-# define ACE_LACKS_SYS_MSG_H
-# define ACE_LACKS_ALPHASORT
-# define ACE_LACKS_STRPTIME
-# define ACE_LACKS_POLL_H
-#else
-# define ACE_HAS_POLL 1
-# define ACE_HAS_WCHAR 1
-# define ACE_HAS_XPG4_MULTIBYTE_CHAR 1
-#endif
+#define ACE_HAS_POLL 1
+#define ACE_HAS_WCHAR 1
+#define ACE_HAS_XPG4_MULTIBYTE_CHAR 1
 
 #if _NTO_VERSION < 710
 # define ACE_LACKS_CONST_TIMESPEC_PTR

diff --git a/ACE/ace/os_include/sys/os_select.h b/ACE/ace/os_include/sys/os_select.h
@@ -40,15 +40,9 @@ extern "C"
 {
 #endif /* __cplusplus */
 
-#if defined (ACE_LACKS_FD_MASK)
-   typedef long fd_mask;
-#endif /* ACE_LACKS_FD_MASK */
-
 #if defined (ACE_WIN32)
    // This will help until we figure out everything:
 #  define NFDBITS 32 /* only used in unused functions... */
-#elif defined (ACE_LACKS_NFDBITS)
-#  define NFDBITS (sizeof(fd_mask) * NBBY)        /* bits per mask */
 #endif /* ACE_WIN32 */
 
 #ifdef __cplusplus