From 3c22daa66ed73bc80d7e6db3346ac10ccb6db36d Mon Sep 17 00:00:00 2001
From: Aleksei Nikiforov <aleksei.nikiforov@linux.ibm.com>
Date: Wed, 15 Jan 2025 11:59:30 +0100
Subject: [PATCH] Update preprocessor directives according to guidelines

---
 ggml/src/gguf.cpp          | 10 +++++-----
 src/llama-mmap.cpp         |  4 ++--
 src/llama-model-loader.cpp |  4 ++--
 src/unicode.h              |  8 ++++----
 tests/test-gguf.cpp        |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ggml/src/gguf.cpp b/ggml/src/gguf.cpp
index a3d99ab16..602995c57 100644
--- a/ggml/src/gguf.cpp
+++ b/ggml/src/gguf.cpp
@@ -1151,9 +1151,9 @@ struct gguf_writer {
             buf.push_back(reinterpret_cast<const int8_t *>(&val)[i]);
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
             buf.push_back(reinterpret_cast<const int8_t *>(&val)[sizeof(val) - i - 1]);
-#else
+#else // __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 #error Unexpected or undefined __BYTE_ORDER__
-#endif
+#endif // __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
         }
     }
 
@@ -1266,9 +1266,9 @@ struct gguf_writer {
                     write(kv.get_val<double>(i));
                 }
             } break;
-#else
+#else // __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 #error Unexpected or undefined __BYTE_ORDER__
-#endif
+#endif // __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
             case GGUF_TYPE_BOOL: {
                 for (size_t i = 0; i < ne; ++i) {
                     write(kv.get_val<bool>(i));
@@ -1324,7 +1324,7 @@ struct gguf_writer {
         if (byteswap != nullptr) {
             byteswap(buf.data() + offset, ggml_nelements(&(info.t)) / ggml_blck_size(info.t.type));
         }
-#endif
+#endif // __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 
         pad(alignment);
     }
diff --git a/src/llama-mmap.cpp b/src/llama-mmap.cpp
index ce33b43b1..20fe2277f 100644
--- a/src/llama-mmap.cpp
+++ b/src/llama-mmap.cpp
@@ -444,9 +444,9 @@ void llama_mmap::unmap_fragment(size_t first, size_t last) { pimpl->unmap_fragme
 // disable mmap on s390x while it usually loads little-endian models
 #if (defined(_POSIX_MEMLOCK_RANGE) && !defined(__s390x__)) || defined(_WIN32)
 const bool llama_mmap::SUPPORTED  = true;
-#else
+#else // (defined(_POSIX_MEMLOCK_RANGE) && !defined(__s390x__)) || defined(_WIN32)
 const bool llama_mmap::SUPPORTED  = false;
-#endif
+#endif // (defined(_POSIX_MEMLOCK_RANGE) && !defined(__s390x__)) || defined(_WIN32)
 
 // llama_mlock
 
diff --git a/src/llama-model-loader.cpp b/src/llama-model-loader.cpp
index be6e607b7..cc98896fc 100644
--- a/src/llama-model-loader.cpp
+++ b/src/llama-model-loader.cpp
@@ -1030,7 +1030,7 @@ bool llama_model_loader::load_all_data(
                 if (byteswap != nullptr) {
                     byteswap(cur->data, ggml_nelements(cur) / ggml_blck_size(cur->type));
                 }
-#endif
+#endif // __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 
                 if (check_tensors) {
                     validation_result.emplace_back(std::async(std::launch::async, [cur, n_size] {
@@ -1066,7 +1066,7 @@ bool llama_model_loader::load_all_data(
                     if (byteswap != nullptr) {
                         byteswap(read_buf.data(), read_buf.size() / ggml_blck_size(cur->type));
                     }
-#endif
+#endif // __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 
                     ggml_backend_tensor_set(cur, read_buf.data(), 0, n_size);
                     if (check_tensors && !ggml_validate_row_data(cur->type, read_buf.data(), n_size)) {
diff --git a/src/unicode.h b/src/unicode.h
index ad55959c0..87b2ef7ca 100644
--- a/src/unicode.h
+++ b/src/unicode.h
@@ -53,9 +53,9 @@ struct unicode_cpt_flags {
         is_lowercase   = (flags & LOWERCASE)   ? 1 : 0;
         is_uppercase   = (flags & UPPERCASE)   ? 1 : 0;
         is_nfd         = (flags & NFD)         ? 1 : 0;
-#else
+#else // __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 #error Unexpected or undefined __BYTE_ORDER__
-#endif
+#endif // __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
     }
 
     inline uint16_t as_uint() const {
@@ -78,9 +78,9 @@ struct unicode_cpt_flags {
             ;
 
         return result;
-#else
+#else // __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 #error Unexpected or undefined __BYTE_ORDER__
-#endif
+#endif // __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
     }
 
     inline uint16_t category_flag() const {
diff --git a/tests/test-gguf.cpp b/tests/test-gguf.cpp
index 86a0cdb44..dc87f5f0a 100644
--- a/tests/test-gguf.cpp
+++ b/tests/test-gguf.cpp
@@ -561,7 +561,7 @@ static bool handcrafted_check_kv(const gguf_context * gguf_ctx, const unsigned i
                     }
                     break;
             }
-#endif
+#endif // __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 
             if (!std::equal(data8, data8 + arr_n*type_size, data_gguf)) {
                 ok = false;
@@ -597,7 +597,7 @@ static bool handcrafted_check_kv(const gguf_context * gguf_ctx, const unsigned i
                 ggml_convert_to_le((uint64_t*)(data8));
                 break;
         }
-#endif
+#endif // __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 
         if (!std::equal(data8, data8 + gguf_type_size(type), data_gguf)) {
             ok = false;