More cleanup

    * ACE/ace/OS_NS_Thread.cpp:
    * ACE/ace/OS_NS_Thread.inl:
    * ACE/ace/config-hurd.h:
    * ACE/ace/os_include/os_unistd.h:
    * ACE/ace/os_include/sys/os_mman.h:

5 files changed, 3 insertions, 28 deletions

diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp
index b1b23e534a2..d4e3c82b253 100644
--- a/ACE/ace/OS_NS_Thread.cpp
+++ b/ACE/ace/OS_NS_Thread.cpp
@@ -3285,19 +3285,14 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
 }
 
 int
-ACE_OS::scheduling_class (const char *class_name, ACE_id_t &id)
+ACE_OS::scheduling_class (const char */*class_name*/, ACE_id_t &/*id*/)
 {
-  ACE_UNUSED_ARG (class_name);
-  ACE_UNUSED_ARG (id);
   ACE_NOTSUP_RETURN (-1);
 }
 
 int
-ACE_OS::set_scheduling_params (const ACE_Sched_Params &sched_params,
-                               ACE_id_t id)
+ACE_OS::set_scheduling_params (const ACE_Sched_Params &/*sched_params*/, ACE_id_t /*id*/)
 {
-  ACE_UNUSED_ARG (sched_params);
-  ACE_UNUSED_ARG (id);
   ACE_NOTSUP_RETURN (-1);
 }
 
diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl
index 35cb7ece5c8..93262e0c87f 100644
--- a/ACE/ace/OS_NS_Thread.inl
+++ b/ACE/ace/OS_NS_Thread.inl
@@ -534,13 +534,9 @@ ACE_OS::event_init (ACE_event_t *event,
 #endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE long
-ACE_OS::priority_control (ACE_idtype_t idtype, ACE_id_t identifier, int cmd, void *arg)
+ACE_OS::priority_control (ACE_idtype_t /*idtype*/, ACE_id_t /*identifier*/, int cmd, void */*arg*/)
 {
   ACE_OS_TRACE ("ACE_OS::priority_control");
-  ACE_UNUSED_ARG (idtype);
-  ACE_UNUSED_ARG (identifier);
-  ACE_UNUSED_ARG (cmd);
-  ACE_UNUSED_ARG (arg);
   ACE_NOTSUP_RETURN (-1);
 }
 
diff --git a/ACE/ace/config-hurd.h b/ACE/ace/config-hurd.h
index ef78e596b37..95517b69d86 100644
--- a/ACE/ace/config-hurd.h
+++ b/ACE/ace/config-hurd.h
@@ -59,7 +59,6 @@
 #endif /* __GLIBC__ */
 
 #define ACE_HAS_LSEEK64
-//#define ACE_LACKS_LSEEK64_PROTOTYPE
 
 #define ACE_HAS_P_READ_WRITE
 // Use ACE's alternate cuserid() implementation since the use of the
diff --git a/ACE/ace/os_include/os_unistd.h b/ACE/ace/os_include/os_unistd.h
index e973f964741..14d1621d3ba 100644
--- a/ACE/ace/os_include/os_unistd.h
+++ b/ACE/ace/os_include/os_unistd.h
@@ -118,17 +118,6 @@ extern "C"
 #endif  /* ACE_LACKS_GETPGID_PROTOTYPE &&
            !_XOPEN_SOURCE && !_XOPEN_SOURCE_EXTENDED */
 
-#if !defined (_LARGEFILE64_SOURCE)
-#  if defined (ACE_LACKS_LSEEK64_PROTOTYPE) && \
-      defined (ACE_LACKS_LLSEEK_PROTOTYPE)
-#    error Define either ACE_LACKS_LSEEK64_PROTOTYPE or ACE_LACKS_LLSEEK_PROTOTYPE, not both!
-#  elif defined (ACE_LACKS_LSEEK64_PROTOTYPE)
-     ACE_LOFF_T lseek64 (int fd, ACE_LOFF_T offset, int whence);
-#  elif defined (ACE_LACKS_LLSEEK_PROTOTYPE)
-     ACE_LOFF_T llseek (int fd, ACE_LOFF_T offset, int whence);
-#  endif
-#endif  /* _LARGEFILE64_SOURCE */
-
 #if defined (__BORLANDC__)
 #  define _isatty isatty
 #endif /* __BORLANDC__ */
diff --git a/ACE/ace/os_include/sys/os_mman.h b/ACE/ace/os_include/sys/os_mman.h
index d2b9a713f56..6671ffd1c86 100644
--- a/ACE/ace/os_include/sys/os_mman.h
+++ b/ACE/ace/os_include/sys/os_mman.h
@@ -97,10 +97,6 @@ PAGE_NOCACHE  */
 #   define MS_SYNC 0x0
 # endif /* !MS_SYNC */
 
-#if !defined (ACE_LACKS_MADVISE) && defined (ACE_LACKS_MADVISE_PROTOTYPE)
-  extern "C" int madvise(caddr_t, size_t, int);
-#endif /* !ACE_LACKS_MADVISE && ACE_LACKS_MADVISE_PROTOTYPE */
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */