Fix for declared near() function, backport from ART. Various other minor changes.

2020-10-16 13:30:47 +02:00
parent 9ee48d83f9
commit badf92ba64
6 changed files with 11 additions and 13 deletions
--- a/rtengine/ashift_dt.c
+++ b/rtengine/ashift_dt.c
@@ -103,6 +103,9 @@ using namespace std;

 //-----------------------------------------------------------------------------
 // RT: BEGIN COMMENT
+#ifdef near
+#  undef near
+#endif         
 #if 0
 DT_MODULE_INTROSPECTION(4, dt_iop_ashift_params_t)