summaryrefslogtreecommitdiff
path: root/ace/os_include/os_unistd.h
diff options
context:
space:
mode:
Diffstat (limited to 'ace/os_include/os_unistd.h')
-rw-r--r--ace/os_include/os_unistd.h22
1 files changed, 10 insertions, 12 deletions
diff --git a/ace/os_include/os_unistd.h b/ace/os_include/os_unistd.h
index a60a3b18595..8a9324cd741 100644
--- a/ace/os_include/os_unistd.h
+++ b/ace/os_include/os_unistd.h
@@ -44,15 +44,13 @@
# include /**/ <unistd.h>
#endif /* !ACE_LACKS_UNISTD_H */
-#if defined (ACE_VXWORKS)
-# if !defined (__RTP__)
- // for unlink(), close(), read(), write(), lseek(), chdir(), getcwd(),
- // getwd(), and isatty()
- # include /**/ <ioLib.h>
-# endif
+#if defined (VXWORKS)
+// for unlink(), close(), read(), write(), lseek(), chdir(), getcwd(),
+// getwd(), and isatty()
+# include /**/ <ioLib.h>
// for gethostname()
# include /**/ <hostLib.h>
-#endif /* ACE_VXWORKS */
+#endif /* VXWORKS */
// Place all additions (especially function declarations) within extern "C" {}
#ifdef __cplusplus
@@ -136,11 +134,11 @@ extern "C"
#endif /* _LARGEFILE64_SOURCE */
#if defined (__BORLANDC__)
+# define _chdir chdir
+# undef _access
+# define _access access
# if (__BORLANDC__ <= 0x540)
# define _getcwd getcwd
-# define _chdir chdir
-# undef _access
-# define _access access
# endif
# define _isatty isatty
#endif /* __BORLANDC__ */
@@ -171,11 +169,11 @@ extern "C"
#if defined (ACE_LACKS_SWAB_PROTOTYPE)
void swab(const void *, void *, ssize_t);
#endif /* ACE_LACKS_SWAB_PROTOTYPE */
-
+
#if defined (ACE_LACKS_GETOPT_PROTOTYPE)
int getopt(int, char * const [], const char *);
#endif /* ACE_LACKS_GETOPT_PROTOTYPE */
-
+
#ifdef __cplusplus
}
#endif /* __cplusplus */