From 454c60970f71aaa02ec03f01533f3b45110cc8ec Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Sun, 31 Jul 2016 20:48:42 +0200
Subject: [PATCH] avoid clashing with remove(3) prototype

---
 app/tests/test-gimpidtable.c | 50 ++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/app/tests/test-gimpidtable.c b/app/tests/test-gimpidtable.c
index 1344fde07f..0e882182fd 100644
--- a/app/tests/test-gimpidtable.c
+++ b/app/tests/test-gimpidtable.c
@@ -29,7 +29,7 @@
               GimpTestFixture, \
               NULL, \
               gimp_test_id_table_setup, \
-              function, \
+              gimp_test_id_ ## function, \
               gimp_test_id_table_teardown);
 
 
@@ -59,13 +59,13 @@ gimp_test_id_table_teardown (GimpTestFixture *fixture,
 }
 
 /**
- * insert_and_lookup:
+ * gimp_test_id_insert_and_lookup:
  *
  * Test that insert and lookup works.
  **/
 static void
-insert_and_lookup (GimpTestFixture *f,
-                   gconstpointer    data)
+gimp_test_id_insert_and_lookup (GimpTestFixture *f,
+                                gconstpointer    data)
 {
   gint     ret_id   = gimp_id_table_insert (f->id_table, data1);
   gpointer ret_data = gimp_id_table_lookup (f->id_table, ret_id);
@@ -74,13 +74,13 @@ insert_and_lookup (GimpTestFixture *f,
 }
 
 /**
- * insert_twice:
+ * gimp_test_id_insert_twice:
  *
  * Test that two consecutive inserts generates different IDs.
  **/
 static void
-insert_twice (GimpTestFixture *f,
-              gconstpointer    data)
+gimp_test_id_insert_twice (GimpTestFixture *f,
+                           gconstpointer    data)
 {
   gint     ret_id    = gimp_id_table_insert (f->id_table, data1);
   gpointer ret_data  = gimp_id_table_lookup (f->id_table, ret_id);
@@ -93,13 +93,13 @@ insert_twice (GimpTestFixture *f,
 }
 
 /**
- * insert_with_id:
+ * gimp_test_id_insert_with_id:
  *
  * Test that it is possible to insert data with a specific ID.
  **/
 static void
-insert_with_id (GimpTestFixture *f,
-                gconstpointer    data)
+gimp_test_id_insert_with_id (GimpTestFixture *f,
+                             gconstpointer    data)
 {
   const int id = 10;
 
@@ -111,14 +111,14 @@ insert_with_id (GimpTestFixture *f,
 }
 
 /**
- * insert_with_id_existing:
+ * gimp_test_id_insert_with_id_existing:
  *
  * Test that it is not possible to insert data with a specific ID if
  * that ID already is inserted.
  **/
 static void
-insert_with_id_existing (GimpTestFixture *f,
-                         gconstpointer    data)
+gimp_test_id_insert_with_id_existing (GimpTestFixture *f,
+                                      gconstpointer    data)
 {
   const int id = 10;
 
@@ -134,14 +134,14 @@ insert_with_id_existing (GimpTestFixture *f,
 }
 
 /**
- * replace:
+ * gimp_test_id_replace:
  *
  * Test that it is possible to replace data with a given ID with
  * different data.
  **/
 static void
-replace (GimpTestFixture *f,
-         gconstpointer    data)
+gimp_test_id_replace (GimpTestFixture *f,
+                      gconstpointer    data)
 {
   int ret_id = gimp_id_table_insert (f->id_table, data1);
   gpointer ret_data;
@@ -153,14 +153,14 @@ replace (GimpTestFixture *f,
 }
 
 /**
- * replace_as_insert:
+ * gimp_test_id_replace_as_insert:
  *
  * Test that replace works like insert when there is no data to
  * replace.
  **/
 static void
-replace_as_insert (GimpTestFixture *f,
-                   gconstpointer    data)
+gimp_test_id_replace_as_insert (GimpTestFixture *f,
+                                gconstpointer    data)
 {
   const int id = 10;
 
@@ -173,13 +173,13 @@ replace_as_insert (GimpTestFixture *f,
 }
 
 /**
- * remove:
+ * gimp_test_id_remove:
  *
  * Test that it is possible to remove data identified by the ID:
  **/
 static void
-remove (GimpTestFixture *f,
-        gconstpointer    data)
+gimp_test_id_remove (GimpTestFixture *f,
+                     gconstpointer    data)
 {
   gint     ret_id            = gimp_id_table_insert (f->id_table, data1);
   void    *ret_data          = gimp_id_table_lookup (f->id_table, ret_id);
@@ -192,14 +192,14 @@ remove (GimpTestFixture *f,
 }
 
 /**
- * remove_non_existing:
+ * gimp_test_id_remove_non_existing:
  *
  * Tests that things work properly when trying to remove data with an
  * ID that doesn't exist.
  **/
 static void
-remove_non_existing (GimpTestFixture *f,
-                     gconstpointer    data)
+gimp_test_id_remove_non_existing (GimpTestFixture *f,
+                                  gconstpointer    data)
 {
   const int id = 10;