From ceededf47e36cbabfce55b9434802d80f68788fd Mon Sep 17 00:00:00 2001 From: landry Date: Mon, 27 Jun 2022 04:49:52 +0000 Subject: [PATCH] geo/pgpointcloud: remove patches forgotten in 1.2.2 --- .../patches/patch-lib_cunit_cu_tester_c | 16 ---------- .../patches/patch-lib_cunit_cu_tester_h | 30 ------------------- 2 files changed, 46 deletions(-) delete mode 100644 geo/pgpointcloud/patches/patch-lib_cunit_cu_tester_c delete mode 100644 geo/pgpointcloud/patches/patch-lib_cunit_cu_tester_h diff --git a/geo/pgpointcloud/patches/patch-lib_cunit_cu_tester_c b/geo/pgpointcloud/patches/patch-lib_cunit_cu_tester_c deleted file mode 100644 index 1fa2de857f9..00000000000 --- a/geo/pgpointcloud/patches/patch-lib_cunit_cu_tester_c +++ /dev/null @@ -1,16 +0,0 @@ -fix for -fno-common -https://github.com/pgpointcloud/pointcloud/pull/273 - -Index: lib/cunit/cu_tester.c ---- lib/cunit/cu_tester.c.orig -+++ lib/cunit/cu_tester.c -@@ -12,6 +12,9 @@ - #include "CUnit/Basic.h" - #include "cu_tester.h" - -+/* Contains the most recent error message generated by rterror. */ -+static char cu_error_msg[MAX_CUNIT_MSG_LENGTH+1]; -+ - /* ADD YOUR SUITE HERE (1 of 2) */ - extern CU_SuiteInfo schema_suite; - extern CU_SuiteInfo patch_suite; diff --git a/geo/pgpointcloud/patches/patch-lib_cunit_cu_tester_h b/geo/pgpointcloud/patches/patch-lib_cunit_cu_tester_h deleted file mode 100644 index 9c489088ab9..00000000000 --- a/geo/pgpointcloud/patches/patch-lib_cunit_cu_tester_h +++ /dev/null @@ -1,30 +0,0 @@ -fix for -fno-common -https://github.com/pgpointcloud/pointcloud/pull/273 - -Index: lib/cunit/cu_tester.h ---- lib/cunit/cu_tester.h.orig -+++ lib/cunit/cu_tester.h -@@ -7,6 +7,9 @@ - * - ***********************************************************************/ - -+#ifndef _CU_TESTER_H -+#define _CU_TESTER_H -+ - #include "pc_api_internal.h" - - #define PC_TEST(test_func) { #test_func, test_func } -@@ -14,11 +17,10 @@ - #define CU_ASSERT_SUCCESS(rv) CU_ASSERT( (rv) == PC_SUCCESS ) - #define CU_ASSERT_FAILURE(rv) CU_ASSERT( (rv) == PC_FAILURE ) - --/* Contains the most recent error message generated by rterror. */ --char cu_error_msg[MAX_CUNIT_MSG_LENGTH+1]; -- - /* Read a file (XML) into a cstring */ - char* file_to_str(const char *fname); - - /* Resets cu_error_msg back to blank. */ - void cu_error_msg_reset(void); -+ -+#endif