summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ace/OS.cpp7
-rw-r--r--ace/OS.h2
2 files changed, 5 insertions, 4 deletions
diff --git a/ace/OS.cpp b/ace/OS.cpp
index 37ed06cecf6..9fb6e139172 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -780,9 +780,6 @@ ACE_TRACE ("ACE_OS::mutex_lock_cleanup");
#endif /* ACE_HAS_THREADS */
}
-// The following *printf functions aren't inline because
-// they use varargs.
-
#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
FILE *
ACE_OS::fopen (const char *filename, const char *mode)
@@ -852,6 +849,10 @@ ACE_OS::fopen (const wchar_t *filename, const wchar_t *mode)
# endif /* ACE_WIN32 */
#if !defined (ACE_HAS_WINCE)
+
+// The following *printf functions aren't inline because
+// they use varargs.
+
int
ACE_OS::fprintf (FILE *fp, const char *format, ...)
{
diff --git a/ace/OS.h b/ace/OS.h
index 91b1b1e36c4..a584eb699d0 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -29,7 +29,7 @@
# if defined (ACE_HAS_PHARLAP_RT)
#define ACE_IPPROTO_TCP SOL_SOCKET
# else
-#define ACE_IPPROTO_TCP IPPROTO_TCP;
+#define ACE_IPPROTO_TCP IPPROTO_TCP
# endif /* ACE_HAS_PHARLAP_RT */
#if !defined (ACE_MALLOC_ALIGN)