Make slightly less clever use of token pasting to make gcc happy

Author: oddbookworm

ctest/base_ctest.c

@@ -13,7 +13,7 @@ void tearDown(void) {}
 /**
  * @brief Tests _pg_is_int_tuple when passed a tuple of ints
  */
-PG_CTEST(test__pg_is_int_tuple_nominal) {
+PG_CTEST(test__pg_is_int_tuple_nominal)(PyObject *self, PyObject *_null) {
   PyObject *arg1 = Py_BuildValue("(iii)", 1, 2, 3);
   PyObject *arg2 = Py_BuildValue("(iii)", -1, -2, -3);
   PyObject *arg3 = Py_BuildValue("(iii)", 1, -2, -3);
@@ -28,7 +28,7 @@ PG_CTEST(test__pg_is_int_tuple_nominal) {
 /**
  * @brief Tests _pg_is_int_tuple when passed a tuple of non-numeric values
  */
-PG_CTEST(test__pg_is_int_tuple_failureModes) {
+PG_CTEST(test__pg_is_int_tuple_failureModes)(PyObject *self, PyObject *_null) {
   PyObject *arg1 =
       Py_BuildValue("(sss)", (char *)"Larry", (char *)"Moe", (char *)"Curly");
   PyObject *arg2 = Py_BuildValue("(sss)", (char *)NULL, (char *)NULL,
@@ -45,7 +45,7 @@ PG_CTEST(test__pg_is_int_tuple_failureModes) {
 /**
  * @brief Tests _pg_is_int_tuple when passed a tuple of floats
  */
-PG_CTEST(test__pg_is_int_tuple_floats) {
+PG_CTEST(test__pg_is_int_tuple_floats)(PyObject *self, PyObject *_null) {
   PyObject *arg1 = Py_BuildValue("(ddd)", 1.0, 2.0, 3.0);
   PyObject *arg2 = Py_BuildValue("(ddd)", -1.1, -2.2, -3.3);
   PyObject *arg3 = Py_BuildValue("(ddd)", 1.0, -2.0, -3.1);

ctest/test_common.h

@@ -21,10 +21,14 @@ struct TestCase {
     The RUN_TEST_PG_INTERNAL macro then references that struct for each test
     case that we tell it about and automatically populates the unity fields
     with the requisite data.
+
+    Note that the arguments to the test function must be *exactly*
+    (PyObject * self, PyObject * _null), but due to gcc throwing a fit, I
+    cannot just use token pasting to have the macro generate that part for me
 */
 #define PG_CTEST(TestFunc)                                                     \
   static struct TestCase meta_##TestFunc = {#TestFunc, __LINE__};              \
-  static PyObject *TestFunc##(PyObject * self, PyObject * _null)
+  static PyObject *TestFunc
 
 #define RUN_TEST_PG_INTERNAL(TestFunc)                                         \
   {                                                                            \