summaryrefslogtreecommitdiff
path: root/ACE/ace/OS_NS_stdio.cpp
diff options
context:
space:
mode:
authorErik Sohns <esohns@users.noreply.github.com>2023-01-22 17:38:34 +0100
committerGitHub <noreply@github.com>2023-01-22 17:38:34 +0100
commit9e18d338ec598e1a8da6d32a0fba5a20c76978f7 (patch)
tree045f42001bd4e15cf8285686798fe47acd2f2b60 /ACE/ace/OS_NS_stdio.cpp
parent8b6ad82dc91f728cea2c9e86a17e5969a3338fcc (diff)
parent8ab31e3e5bb8c09a9c326a54545f4cb475345a78 (diff)
downloadATCD-9e18d338ec598e1a8da6d32a0fba5a20c76978f7.tar.gz
Merge branch 'master' into message_queue_ex_get_queue
Diffstat (limited to 'ACE/ace/OS_NS_stdio.cpp')
-rw-r--r--ACE/ace/OS_NS_stdio.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/ace/OS_NS_stdio.cpp b/ACE/ace/OS_NS_stdio.cpp
index 1b271b703fc..76db871d18d 100644
--- a/ACE/ace/OS_NS_stdio.cpp
+++ b/ACE/ace/OS_NS_stdio.cpp
@@ -26,7 +26,7 @@ ACE_TEXT_OSVERSIONINFO ACE_OS::win32_versioninfo_;
HINSTANCE ACE_OS::win32_resource_module_;
ACE_END_VERSIONED_NAMESPACE_DECL
-# if defined (ACE_HAS_DLL) && (ACE_HAS_DLL == 1) && !defined (ACE_HAS_WINCE)
+# if defined (ACE_HAS_DLL) && (ACE_HAS_DLL == 1)
// This function is called by the OS when the ACE DLL is loaded. We
// use it to determine the default module containing ACE's resources.
extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID)
@@ -86,7 +86,7 @@ ace_flock_t::dump () const
/*****************************************************************************/
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32)
namespace
{
/// Translate fopen's mode char to open's mode. This helper function