refactor: move '*_type_def'/'*_type_spec' forwards ahead of private h…

…elper forwards
zopefoundation · Jun 6, 2024 · 95bf6ad · 95bf6ad
1 parent 429d1e1
commit 95bf6ad
Showing 1 changed file with 44 additions and 45 deletions.
diff --git a/src/BTrees/BTreeModuleTemplate.c b/src/BTrees/BTreeModuleTemplate.c
@@ -292,6 +292,50 @@ static char *SEARCH_KEYWORDS[] = {
     "min", "max", "excludemin", "excludemax", 0
 };
 
+/*
+ *  Forward-declare PyTypeObjects / PyType_Specs.
+ */
+
+#if USE_STATIC_TYPES
+
+/* Defined in BTreeTemplate.c  */
+static PyTypeObject BTreeType_type_def; /* metatype */
+static PyTypeObject BTree_type_def;
+
+/* Defined in BTreeItemsTemplate.c  */
+static PyTypeObject BTreeItems_type_def;
+static PyTypeObject BTreeIter_type_def;
+
+/* Defined in BucketTemplate.c  */
+static PyTypeObject Bucket_type_def;
+
+/* Defined in SetTemplate.c  */
+static PyTypeObject Set_type_def;
+
+/* Defined in TreeSetTemplate.c  */
+static PyTypeObject TreeSet_type_def;
+
+#else
+
+/* Defined in BTreeTemplate.c  */
+static PyType_Spec BTreeType_type_spec; /* metatype */
+static PyType_Spec BTree_type_spec;
+
+/* Defined in BTreeItemsTemplate.c  */
+static PyType_Spec BTreeItems_type_spec;
+static PyType_Spec BTreeIter_type_spec;
+
+/* Defined in BucketTemplate.c  */
+static PyType_Spec Bucket_type_spec;
+
+/* Defined in SetTemplate.c  */
+static PyType_Spec Set_type_spec;
+
+/* Defined in TreeSetTemplate.c  */
+static PyType_Spec TreeSet_type_spec;
+
+#endif
+
 /*
  *  Forward-declare private helper functions
  */
@@ -365,51 +409,6 @@ static int ulonglong_convert(PyObject *ob, unsigned PY_LONG_LONG *value);
 
 #endif  /* defined(NEED_LONG_LONG_SUPPORT) */
 
-/*
- *  Forward-declare PyTypeObjects / PyType_Specs.
- */
-
-
-#if USE_STATIC_TYPES
-
-/* Defined in BTreeTemplate.c  */
-static PyTypeObject BTreeType_type_def; /* metatype */
-static PyTypeObject BTree_type_def;
-
-/* Defined in BTreeItemsTemplate.c  */
-static PyTypeObject BTreeItems_type_def;
-static PyTypeObject BTreeIter_type_def;
-
-/* Defined in BucketTemplate.c  */
-static PyTypeObject Bucket_type_def;
-
-/* Defined in SetTemplate.c  */
-static PyTypeObject Set_type_def;
-
-/* Defined in TreeSetTemplate.c  */
-static PyTypeObject TreeSet_type_def;
-
-#else
-
-/* Defined in BTreeTemplate.c  */
-static PyType_Spec BTreeType_type_spec; /* metatype */
-static PyType_Spec BTree_type_spec;
-
-/* Defined in BTreeItemsTemplate.c  */
-static PyType_Spec BTreeItems_type_spec;
-static PyType_Spec BTreeIter_type_spec;
-
-/* Defined in BucketTemplate.c  */
-static PyType_Spec Bucket_type_spec;
-
-/* Defined in SetTemplate.c  */
-static PyType_Spec Set_type_spec;
-
-/* Defined in TreeSetTemplate.c  */
-static PyType_Spec TreeSet_type_spec;
-
-#endif
-
 /*
  *  Forward-declare non-macro aliases for Python APIs, for use in static
  *  initializers.