From 550f7c3e06a3d0b7878590eb0b404819adb49b31 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Thu, 30 Oct 2025 21:53:38 -0400 Subject: [PATCH] refactor HAS_FORMAT => HAVE_FORMAT --- cmake/Libraries.cmake | 6 +++--- src/lib/base/Log.cpp | 8 ++++---- src/lib/platform/XWindowsClipboard.cpp | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmake/Libraries.cmake b/cmake/Libraries.cmake index b433dbc4c..b30d2e151 100644 --- a/cmake/Libraries.cmake +++ b/cmake/Libraries.cmake @@ -57,10 +57,10 @@ macro(configure_libs) std::format_to_n(buffer, 100, \"test {}\", 42); return 0; } - " HAS_FORMAT) + " HAVE_FORMAT) - if(HAS_FORMAT) - add_definitions(-DHAS_FORMAT) + if(HAVE_FORMAT) + add_definitions(-DHAVE_FORMAT) endif() option(ENABLE_COVERAGE "Enable test coverage" OFF) diff --git a/src/lib/base/Log.cpp b/src/lib/base/Log.cpp index 689c05a9f..c3efea3fa 100644 --- a/src/lib/base/Log.cpp +++ b/src/lib/base/Log.cpp @@ -18,7 +18,7 @@ #include #include -#if HAS_FORMAT +#if HAVE_FORMAT #include #endif @@ -73,7 +73,7 @@ void makeTimeString(std::vector &buffer) localtime_r(&t, &tm); #endif -#if HAS_FORMAT +#if HAVE_FORMAT std::format_to_n( buffer.data(), buffer.size(), "{:04}-{:02}-{:02}T{:02}:{:02}:{:02}", tm.tm_year + yearOffset, tm.tm_mon + monthOffset, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec @@ -117,7 +117,7 @@ std::vector makeMessage(const char *filename, int lineNumber, const char * bufferSize += filenameLength + lineNumberLength; std::vector buffer(bufferSize); -#if HAS_FORMAT +#if HAVE_FORMAT std::format_to_n( buffer.data(), bufferSize, "[{}] {}: {}\n\t{}:{}", timeBuffer.data(), sectionName, message, filename, lineNumber ); @@ -129,7 +129,7 @@ std::vector makeMessage(const char *filename, int lineNumber, const char * return buffer; } else { std::vector buffer(bufferSize); -#if HAS_FORMAT +#if HAVE_FORMAT std::format_to_n(buffer.data(), bufferSize, "[{}] {}: {}", timeBuffer.data(), sectionName, message); #else snprintf(buffer.data(), bufferSize, "[%s] %s: %s", timeBuffer.data(), sectionName, message); diff --git a/src/lib/platform/XWindowsClipboard.cpp b/src/lib/platform/XWindowsClipboard.cpp index b6b0c27ae..c5a3cbc23 100644 --- a/src/lib/platform/XWindowsClipboard.cpp +++ b/src/lib/platform/XWindowsClipboard.cpp @@ -22,7 +22,7 @@ #include #include -#if HAS_FORMAT +#if HAVE_FORMAT #include #endif @@ -641,7 +641,7 @@ void XWindowsClipboard::motifFillCache() // get the Motif item property from the root window static const int buffer_size = 18 + 20; char name[buffer_size]; -#if HAS_FORMAT +#if HAVE_FORMAT std::format_to_n(name, buffer_size, "_MOTIF_CLIP_ITEM_{}", header.m_item); #else snprintf(name, buffer_size, "_MOTIF_CLIP_ITEM_%d", header.m_item); @@ -670,7 +670,7 @@ void XWindowsClipboard::motifFillCache() MotifFormatMap motifFormats; for (int32_t i = 0; i < numFormats; ++i) { // get Motif format property from the root window -#if HAS_FORMAT +#if HAVE_FORMAT std::format_to_n(name, buffer_size, "_MOTIF_CLIP_ITEM_{}", formats[i]); #else snprintf(name, buffer_size, "_MOTIF_CLIP_ITEM_%d", formats[i]); @@ -749,7 +749,7 @@ bool XWindowsClipboard::motifGetSelection(const MotifClipFormat *format, Atom *a // part that i don't know. static const int buffer_size = 18 + 20; char name[buffer_size]; -#if HAS_FORMAT +#if HAVE_FORMAT std::format_to_n(name, buffer_size, "_MOTIF_CLIP_ITEM_{}", format->m_data); #else snprintf(name, buffer_size, "_MOTIF_CLIP_ITEM_%d", format->m_data);