CDRIVER-6102 use mn for minutes suffix

src/common/src/mlib/duration.h

@@ -268,7 +268,7 @@ _mlibDurationMaxBetween(mlib_duration lhs, mlib_duration rhs)
  * - `us` (microseconds)
  * - `ms` (milliseconds)
  * - `s` (seconds)
- * - `min` (minutes)
+ * - `mn` (minutes)
  * - `h` (hours)
  *
  * Other unit suffixes will generate a compile-time error
@@ -319,15 +319,15 @@ _mlibCreateDurationFromUnitCount_s(const mlib_upsized_integer n)
 }
 
 static inline mlib_duration
-_mlibCreateDurationFromUnitCount_min(const mlib_upsized_integer n)
+_mlibCreateDurationFromUnitCount_mn(const mlib_upsized_integer n)
 {
  return mlib_duration(_mlibCreateDurationFromUnitCount_us(n), mul, 60 * 1000 * 1000);
 }
 
 static inline mlib_duration
 _mlibCreateDurationFromUnitCount_h(const mlib_upsized_integer n)
 {
- return mlib_duration(_mlibCreateDurationFromUnitCount_min(n), mul, 60);
+ return mlib_duration(_mlibCreateDurationFromUnitCount_mn(n), mul, 60);
 }
 
 /**

src/common/tests/test-mlib.c

@@ -950,11 +950,11 @@ _test_duration(void)
  d = mlib_duration((4, s), min, (400, ms));
  mlib_check(mlib_duration_cmp(d, ==, (400, ms)));
 
- d = mlib_duration(10, min);
+ d = mlib_duration(10, mn);
  mlib_check(mlib_duration_cmp(d, ==, (600, s)));
 
  d = mlib_duration(4, h);
- mlib_check(mlib_duration_cmp(d, ==, (240, min)));
+ mlib_check(mlib_duration_cmp(d, ==, (240, mn)));
 
  d = mlib_duration((10, s), div, 20);
  d = mlib_duration(
@@ -1038,6 +1038,15 @@ _test_duration(void)
  ts = mlib_duration_to_timespec(mlib_duration(-5000908, us));
  mlib_check(ts.tv_sec, eq, -5);
  mlib_check(ts.tv_nsec, eq, -908000);
+
+// Test when min is defined (CDRIVER-6102)
+#pragma push_macro("min")
+#undef min
+#define min(a, b) ((a) > (b) ? (b) : (a))
+ d = mlib_duration((1, s), min, (2, s));
+ mlib_check(mlib_duration_cmp(d, ==, (1, s)));
+ d = mlib_duration(3, mn);
+#pragma pop_macro("min")
 }
 
 static void

src/libmongoc/tests/test-mongoc-sdam.c

@@ -755,7 +755,7 @@ heartbeat_succeeded(const mongoc_apm_server_heartbeat_succeeded_t *event)
 #endif
 }
 
-#define RTT_TEST_TIMEOUT mlib_duration(1, min)
+#define RTT_TEST_TIMEOUT mlib_duration(1, mn)
 #define RTT_TEST_INITIAL_SLEEP mlib_duration(2, s)
 #define RTT_TEST_TICK mlib_duration(10, ms)