From 9c5fc13c339e154e04cbaeb9b7f5f12bccf453b1 Mon Sep 17 00:00:00 2001 From: "Stephen L. De Rudder" Date: Fri, 23 May 2025 14:40:28 -0500 Subject: [PATCH] Typos --- src/configurator.cxx | 2 +- src/env.cxx | 4 ++-- src/global-init.cxx | 2 +- src/lockfile.cxx | 2 +- src/property.cxx | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/configurator.cxx b/src/configurator.cxx index be4063ee5..7cd0efda7 100644 --- a/src/configurator.cxx +++ b/src/configurator.cxx @@ -78,7 +78,7 @@ namespace break; #endif -#if (defined (LOG4CPLUS_HAVE_CODECVT_UTF16_FACET) || defined (WIN32)) \ +#if (defined (LOG4CPLUS_HAVE_CODECVT_UTF16_FACET) || defined (_WIN32)) \ && defined (UNICODE) case PropertyConfigurator::fUTF16: pflags |= helpers::Properties::fUTF16; diff --git a/src/env.cxx b/src/env.cxx index 0045954e2..bf988f0fd 100644 --- a/src/env.cxx +++ b/src/env.cxx @@ -317,7 +317,7 @@ static tstring get_current_dir () { -#if defined (WIN32) +#if defined (_WIN32) tstring result (0x8000, LOG4CPLUS_TEXT ('\0')); DWORD len = GetCurrentDirectory (static_cast(result.size ()), &result[0]); @@ -359,7 +359,7 @@ get_current_dir () } -#if defined (WIN32) +#if defined (_WIN32) static tchar get_current_drive () diff --git a/src/global-init.cxx b/src/global-init.cxx index 4f2c0d3b3..c3fa4cb96 100644 --- a/src/global-init.cxx +++ b/src/global-init.cxx @@ -919,7 +919,7 @@ struct _static_log4cplus_initializer } // namespace -#else // defined (WIN32) +#else // defined (_WIN32) namespace { #if ! defined (LOG4CPLUS_REQUIRE_EXPLICIT_INITIALIZATION) diff --git a/src/lockfile.cxx b/src/lockfile.cxx index a64c5a253..a9311aa03 100644 --- a/src/lockfile.cxx +++ b/src/lockfile.cxx @@ -135,7 +135,7 @@ LOG4CPLUS_PRIVATE bool trySetCloseOnExec (int fd) { -#if defined (WIN32) +#if defined (_WIN32) int ret = SetHandleInformation (get_os_HANDLE (fd), HANDLE_FLAG_INHERIT, 0); if (! ret) { diff --git a/src/property.cxx b/src/property.cxx index 6c4ad4e27..9b4153fcc 100644 --- a/src/property.cxx +++ b/src/property.cxx @@ -159,7 +159,7 @@ imbue_file_from_flags ([[maybe_unused]] tistream & file, unsigned flags) static_cast(std::consume_header | std::little_endian)>)); break; -#elif defined (UNICODE) && defined (WIN32) +#elif defined (UNICODE) && defined (_WIN32) case Properties::fUTF16: file.imbue ( std::locale (file.getloc (),