From: mgroeber9110 <redacted>
Date: Sat, 27 Apr 2024 19:02:06 +0000 (+0200)
Subject: Replace "alternative" boolean operator in conditional compilation directive (#6949)
X-Git-Tag: upstream/0.0.4488~1736
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=4dba7e8114d84241c842b986e008af8b88d1a019;p=pkg%2Fggml%2Fsources%2Fllama.cpp

Replace "alternative" boolean operator in conditional compilation directive (#6949)
---

diff --git a/common/log.h b/common/log.h
index e4edcac7..2b2f0e45 100644
--- a/common/log.h
+++ b/common/log.h
@@ -234,7 +234,7 @@ inline std::string log_filename_generator_impl(LogTriState multilog, const std::
 // INTERNAL, DO NOT USE
 //  USE LOG() INSTEAD
 //
-#if !defined(_MSC_VER) or defined(__INTEL_LLVM_COMPILER)
+#if !defined(_MSC_VER) || defined(__INTEL_LLVM_COMPILER)
     #define LOG_IMPL(str, ...)                                                                                      \
     do {                                                                                                            \
         if (LOG_TARGET != nullptr)                                                                                  \
@@ -257,7 +257,7 @@ inline std::string log_filename_generator_impl(LogTriState multilog, const std::
 // INTERNAL, DO NOT USE
 //  USE LOG_TEE() INSTEAD
 //
-#if !defined(_MSC_VER) or defined(__INTEL_LLVM_COMPILER)
+#if !defined(_MSC_VER) || defined(__INTEL_LLVM_COMPILER)
     #define LOG_TEE_IMPL(str, ...)                                                                                                      \
     do {                                                                                                                                \
         if (LOG_TARGET != nullptr)                                                                                                      \