Add algorithm.h and portability/fixes

Add new opencstl/algorithm.h and include it in the umbrella header; update amalgamate.py to copy the single-header into examples. Fix various portability and correctness issues: change __cstl_va_start to cast beg=(void*)V, widen RNG state to unsigned __int128 and cast return to unsigned long long, improve platform-specific time functions and fopen behavior, and rename version symbols to OPENCSTL_VERSION/opencstl_version. Tidy up main and tests (limit rand ranges, fix printf formats, reorder test calls, remove dead code) and clean test/check.c. Update README platform table and formatting and make a small CMakeLists tweak.

Author: springkim

CMakeLists.txt

@@ -2,6 +2,6 @@ cmake_minimum_required(VERSION 3.10)
 project(OpenCSTL C)
 
 set(CMAKE_C_STANDARD 11)
-set(CMAKE_CXX_COMPILER 17)
+
 set(EXE_NAME OpenCSTL)
 add_executable(${EXE_NAME} main.c)

README.md

@@ -12,8 +12,12 @@
   <a href="README.zh.md">中文</a>
 </p>
 
+
+
 ---
 
+
+
 ## Why OpenCSTL?
 
 - **Single-header** — Just `#include "opencstl.h"` and you're done. No build steps, no linking.
@@ -51,12 +55,11 @@ curl -LO "https://raw.githubusercontent.com/springkim/OpenCSTL/refs/heads/master
 
 | Compiler | Windows | macOS | Linux |
 |----------|:-------:|:-----:|:-----:|
-| MSVC (cl) | ✅ | | |
-| GNU (gcc) | ✅ | ✅ | ✅ |
+| MSVC (cl) | ✅ | ❌ | ❌ |
+| GNU / MinGW64 (gcc) | ✅ | ✅ | ✅ |
 | LLVM (clang) | ✅ | ✅ | ✅ |
-| MinGW64 | ✅ | | |
-| Intel (icx-cc) | ✅ | ✅ | ✅ |
-|  Tiny C Compiler (tcc) | ✅ |  |  |
+| Intel (icx-cc) | ✅ | ❌ | ✅ |
+|  Tiny C Compiler (tcc) | ✅ | ❌ | ❌ |
 
 ## Document
 
@@ -144,6 +147,7 @@ int main() {
 ```
 
 **Output:**
+
 ```
 [ 38][ 26][ 13][ 83][ 19][777][ 95][ 78][999][999][999][ 87][ 80][ 86]
 [ 13][ 19][ 26][ 38][ 78][ 80][ 83][ 86][ 87][ 95][777][999][999][999]

amalgamate.py

@@ -18,6 +18,7 @@
 import argparse
 from pathlib import Path
 import shutil
+import os
 
 # ──────────────────────────────────────────────────────────────────────────────
 # Regex helpers
@@ -248,6 +249,8 @@ def main():
     print(f'[amalgamate] done    : {len(amalg.visited)} file(s) inlined, '
           f'{total} lines → {out_path.name}')
 
+    shutil.copy("opencstl.h", "examples/opencstl.h")
+
 
 if __name__ == '__main__':
     main()

main.c

@@ -87,14 +87,14 @@ void cstl_vector_test3() {
     DECORATE("opencstl{vector/qsort} test begin");
     VECTOR(int) vec = new_vector(int);
     for (int i = 0; i < 100; i++) {
-        int val = rand32();
+        int val = rand32() % 1000;
         push_back(vec, val);
     }
 
 
     stable_sort(vec,size(vec), sizeof(int), LESS(int));
     for (int i = 0; i < size(vec); i++) {
-        printf("Sorted: [%lld]\n", vec[i]);
+        printf("Sorted: [%d]\n", vec[i]);
     }
 
 
@@ -371,78 +371,26 @@ void test01() {
 
 void test02() {
     VECTOR(int) v = new_vector(int);
-    for (int i = 0; i < 1000; i++) {
-        push_back(v, rand32()%10000);
+    for (int i = 0; i < 100; i++) {
+        push_back(v, rand32() % 1000);
     }
 
     sort(v,size(v), sizeof(int),GREATER(int));
 
 
     for (int i = 0; i < size(v); i++) {
-        printf("%d\n", v[i]);
+        printf("[%4d]\n", v[i]);
     }
 
-    exit(0);
-}
-
-#include <stdio.h>
-
-const char *get_c_version(void) {
-#if defined(__STDC_VERSION__)
-#   if __STDC_VERSION__ >= 202311L
-    return "C23";
-#   elif __STDC_VERSION__ >= 201710L
-    return "C17 (C18)";
-#   elif __STDC_VERSION__ >= 201112L
-    return "C11";
-#   elif __STDC_VERSION__ >= 199901L
-    return "C99";
-#   else
-    return "C94 (AMD1)";
-#   endif
-#elif defined(__STDC__)
-    return "C89 (C90)";
-#else
-    return "pre-ANSI C (K&R)";
-#endif
-}
+    printf("%s\n", opencstl_version());
 
-void print_c_version(void) {
-    printf("C Standard : %s\n", get_c_version());
-
-#if defined(__STDC_VERSION__)
-    printf("__STDC_VERSION__ : %ldL\n", (long) __STDC_VERSION__);
-#endif
-
-    // compiler
-#if defined(_MSC_VER)
-    printf("Compiler   : MSVC %d\n", _MSC_VER);
-#elif defined(__clang__)
-    printf("Compiler   : Clang %d.%d.%d\n", __clang_major__, __clang_minor__, __clang_patchlevel__);
-#elif defined(__GNUC__)
-    printf("Compiler   : GCC %d.%d.%d\n", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
-#else
-    printf("Compiler   : Unknown\n");
-#endif
-
-    // platform
-#if defined(_WIN32)
-    printf("Platform   : Windows\n");
-#elif defined(__APPLE__)
-    printf("Platform   : macOS\n");
-#elif defined(__linux__)
-    printf("Platform   : Linux\n");
-#else
-    printf("Platform   : Unknown\n");
-#endif
+    exit(0);
 }
 
 
 int main() {
-    //test02();
-    //cstl_set_test();
-    //print_c_version();
-     test01();
+    test02();
+    test01();
     //cstl_priority_queue_test();
     return 0;
 }

opencstl.h

@@ -184,7 +184,7 @@
 #if defined(_WIN32) || defined(_WIN64) || defined(__TINYC__)
 // On Windows the dispatch macros pass values directly (not pointer-to-value).
 // va_arg(vl,void*) would read the value itself, so use PTR arithmetic instead.
-#define __cstl_va_start(V,C,beg)	va_start(V,C);beg=V;
+#define __cstl_va_start(V,C,beg)	va_start(V,C);beg=(void*)V;
 #define __cstl_va_arg(PTR)	(PTR)
 // Windows: __cstl_va_arg_next is unused (Windows uses PTR-based path),
 // but define it to avoid compile errors if referenced.
@@ -3135,6 +3135,31 @@ OPENCSTL_FUNC void __cstl_hashtable_free(void **container) {
 /* ////////////////////////////////////////////////////////////////////////////// */
 
 
+/* ////////////////////////////////////////////////////////////////////////////// */
+/* BEGIN  algorithm.h                    (depth 1) */
+/* ////////////////////////////////////////////////////////////////////////////// */
+
+//
+// Created by spring on 2026. 4. 9..
+//
+
+#if !defined(_OPENCSTL_C_ALGORITHM_H)
+#define _OPENCSTL_C_ALGORITHM_H
+#ifndef MAX
+#define MAX(a,b) ((a)>(b)?(a):(b))
+#endif
+#ifndef MIN
+#define MIN(a,b) ((a)<(b)?(a):(b))
+#endif
+
+
+#endif //_OPENCSTL_C_ALGORITHM_H
+
+/* ////////////////////////////////////////////////////////////////////////////// */
+/* END    algorithm.h */
+/* ////////////////////////////////////////////////////////////////////////////// */
+
+
 /* ////////////////////////////////////////////////////////////////////////////// */
 /* BEGIN  cstl_compare.h                 (depth 1) */
 /* ////////////////////////////////////////////////////////////////////////////// */
@@ -3344,8 +3369,11 @@ CompareFunc CSTL_GREATER(const char *type_str) {
 #include <limits.h>
 #define CSTL_RAND64_MAX ULLONG_MAX
 #define CSTL_RAND32_MAX UINT_MAX
-static unsigned long long _seed64 = 1;
-static unsigned long _seed32 = 1;
+static unsigned __int128 _seed64 = 1;
+static unsigned long long _seed32 = 1;
+
+//static unsigned long long _seed64 = 1;
+//static unsigned int _seed32 = 1;
 
 static void cstl_rand_seed32(unsigned int seed) {
     _seed32 = seed;
@@ -3362,7 +3390,7 @@ static void cstl_rand_seed64(unsigned long long seed) {
 
 static unsigned long long cstl_rand64() {
     _seed64 = (_seed64 * 6364136223846793005ULL) + 1442695040888963407ULL;
-    return _seed64;
+    return (unsigned long long) _seed64;
 }
 
 
@@ -3383,8 +3411,36 @@ static unsigned long long cstl_rand64() {
 #if !defined(_OPENCSTL_CSTL_TIME_H)
 #define _OPENCSTL_CSTL_TIME_H
 
+#if defined(_WIN32) || defined(_WIN64) || defined(_MSC_VER)
+
+#include <windows.h>
+#include <stdio.h>
+
+typedef LARGE_INTEGER watch;
+
+static watch tick() {
+    watch t;
+    QueryPerformanceCounter(&t);
+    return t;
+}
+
+static double lap(const watch t_beg, const watch t_end) {
+    LARGE_INTEGER freq;
+    QueryPerformanceFrequency(&freq);
+    return (double) (t_end.QuadPart - t_beg.QuadPart) * 1000.0 / (double) freq.QuadPart;
+}
+
+static void yyyy_mm_dd_hh_mm_ss_ms(char *timestr) {
+    SYSTEMTIME st;
+    GetLocalTime(&st);
+    snprintf(timestr, 32, "%04d_%02d_%02d_%02d_%02d_%02d_%03d",
+             (int) st.wYear, (int) st.wMonth, (int) st.wDay,
+             (int) st.wHour, (int) st.wMinute, (int) st.wSecond,
+             (int) st.wMilliseconds);
+}
+
+#elif defined(__MINGW32__) || defined(__MINGW64__) || defined(__GNUC__) || defined(__TINYC__)
 
-#if defined(__MINGW32__) || defined(__MINGW64__) || defined(__GNUC__)
 #include <stdio.h>
 #include <sys/time.h>
 #include <time.h>
@@ -3409,66 +3465,23 @@ static void yyyy_mm_dd_hh_mm_ss_ms(char *timestr) {
     time_t now = tv.tv_sec;
     struct tm tm_now;
 #if defined(__MINGW32__) || defined(__MINGW64__)
-    localtime_s(&tm_now, &now);
-#elif defined(__clang__) || (defined(__GNUC__) && defined(__APPLE__)) || defined(__GNUC__) | defined(__TINYC__)
-    localtime_r(&now, &tm_now);
+localtime_s(&tm_now, &now);
 #else
-    localtime_s(&tm_now, &now);
+localtime_r(&now, &tm_now);
 #endif
-    int ms = (int) (tv.tv_usec / 1000);
-
-    snprintf(timestr, 32, "%04d_%02d_%02d_%02d_%02d_%02d_%03d",
-             tm_now.tm_year + 1900,
-             tm_now.tm_mon + 1,
-             tm_now.tm_mday,
-             tm_now.tm_hour,
-             tm_now.tm_min,
-             tm_now.tm_sec,
-             ms);
-}
-
-#elif defined(_WIN32) || defined(_WIN64) || defined(_MSC_VER)   // MSVC, clang-cl
-
-#include <windows.h>
-#include <stdio.h>
-
-typedef LARGE_INTEGER watch;
 
-static watch tick() {
-    watch t;
-    QueryPerformanceCounter(&t);
-    return t;
-}
-
-static double lap(const watch t_beg, const watch t_end) {
-    LARGE_INTEGER freq;
-    QueryPerformanceFrequency(&freq);
-
-    return (double) (t_end.QuadPart - t_beg.QuadPart) * 1000.0 / (double) freq.QuadPart;
-}
-
-static void yyyy_mm_dd_hh_mm_ss_ms(char *timestr) {
-    SYSTEMTIME st;
-    GetLocalTime(&st);
-
-    snprintf(timestr, 32, "%04d_%02d_%02d_%02d_%02d_%02d_%03d",
-             (int) st.wYear,
-             (int) st.wMonth,
-             (int) st.wDay,
-             (int) st.wHour,
-             (int) st.wMinute,
-             (int) st.wSecond,
-             (int) st.wMilliseconds);
+int ms = (int) (tv.tv_usec / 1000);
+snprintf(timestr, 32, "%04d_%02d_%02d_%02d_%02d_%02d_%03d",
+         tm_now.tm_year+ 1900, tm_now.tm_mon+ 1, tm_now.tm_mday,
+         tm_now.tm_hour, tm_now.tm_min, tm_now.tm_sec,
+         ms);
 }
 
 #else
-
 #error Unsupported compiler/platform
-
 #endif
 
-
-#endif //_OPENCSTL_CSTL_TIME_H
+#endif
 
 /* ////////////////////////////////////////////////////////////////////////////// */
 /* END    cstl_time.h */
@@ -3491,14 +3504,10 @@ static void yyyy_mm_dd_hh_mm_ss_ms(char *timestr) {
 bool cstl_fopen(FILE **fp, const char *filename, const char *mode) {
 #if defined(_WIN32) || defined(_WIN64)
     fopen_s(fp, filename, mode);
-#elif defined(__linux__) && defined(__GNUC__)
-    *fp = fopen(filename, mode);
-#elif defined(__APPLE__)
-    *fp = fopen(filename, mode);
 #else
-    fopen_s(fp, filename, mode);
+    *fp = fopen(filename, mode);
 #endif
-    return fp != NULL;
+    return *fp != NULL;
 }
 
 bool cstl_getline(FILE *fp, char *line, size_t size) {
@@ -3730,10 +3739,10 @@ static void msort(void *base, size_t nmemb, size_t size, int (*compar)(const voi
 #if !defined(_OPENCSTL_VERSION_H)
 #define _OPENCSTL_VERSION_H
 
-static char *VERSION = "1.0.0";
+static char *OPENCSTL_VERSION = "1.0.0";
 
-static char *get_version() {
-    return VERSION;
+static char *opencstl_version() {
+    return OPENCSTL_VERSION;
 }
 #endif //_OPENCSTL_VERSION_H
 

opencstl/algorithm.h

@@ -0,0 +1,16 @@
+//
+// Created by spring on 2026. 4. 9..
+//
+
+#pragma once
+#if !defined(_OPENCSTL_C_ALGORITHM_H)
+#define _OPENCSTL_C_ALGORITHM_H
+#ifndef MAX
+#define MAX(a,b) ((a)>(b)?(a):(b))
+#endif
+#ifndef MIN
+#define MIN(a,b) ((a)<(b)?(a):(b))
+#endif
+
+
+#endif //_OPENCSTL_C_ALGORITHM_H