From 8daf47e7fa2a5fdf1c58797051ea4107d2fef4c5 Mon Sep 17 00:00:00 2001
From: Ivan Maidanski <ivmai@mail.ru>
Date: Fri, 31 Aug 2018 22:38:52 +0300
Subject: [PATCH] Remove MIN_WORDS macro from gc_priv.h (code refactoring)

* include/private/gc_priv.h (MIN_WORDS): Move macro to test.c; remove
FIXME.
* tests/test.c: Update comment for include gc_priv.h.
---
 include/private/gc_priv.h | 3 ---
 tests/test.c              | 6 +++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/private/gc_priv.h b/include/private/gc_priv.h
index 571643b..4f2d308 100644
--- a/include/private/gc_priv.h
+++ b/include/private/gc_priv.h
@@ -916,9 +916,6 @@ EXTERN_C_BEGIN
 # endif
 # define ADD_SLOP(lb) /* lb should have no side-effect */ \
                 SIZET_SAT_ADD(lb, EXTRA_BYTES)
-# ifndef MIN_WORDS
-#  define MIN_WORDS 2   /* FIXME: obsolete */
-# endif
 
 /*
  * Hash table representation of sets of pages.
diff --git a/tests/test.c b/tests/test.c
index 1023b84..8ec8c13 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -61,7 +61,7 @@
 # include "gc_typed.h"
 #endif
 
-#include "private/gc_priv.h"    /* For output, locking, MIN_WORDS,      */
+#include "private/gc_priv.h"    /* For output, locking,                 */
                                 /* some statistics and gcconfig.h.      */
 
 #if defined(MSWIN32) || defined(MSWINCE)
@@ -1303,6 +1303,10 @@ void * GC_CALLBACK inc_int_counter(void *pcounter)
  return NULL;
 }
 
+#ifndef MIN_WORDS
+# define MIN_WORDS 2
+#endif
+
 void run_one_test(void)
 {
 #   ifndef DBG_HDRS_ALL
-- 
2.7.4