Merge branch 'develop-conda' into develop

BIC-MNI · Feb 24, 2025 · e5290db · e5290db
2 parents a2f0989 + e610d9d
commit e5290db
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/libcommon/ParseArgv.c b/libcommon/ParseArgv.c
@@ -320,8 +320,13 @@ ParseArgv(int *argcPtr, char **argv, ArgvInfo *argTable, int flags)
          }
          break;
       case ARGV_FUNC: {
+<<<<<<< HEAD
          typedef int (*handlerProcType)(void*, const char*, char*);
          handlerProcType handlerProc = (handlerProcType)(uintptr_t)infoPtr->src;
+=======
+
+         int (*handlerProc)(void*, const char*, char*) = (int (*)(void*, const char*, char*))(uintptr_t)infoPtr->src;
+>>>>>>> Fixed clang -Wdeprecated-non-prototype warnings
 
          if ((*handlerProc)(infoPtr->dst, infoPtr->key,
                             argv[srcIndex])) {
@@ -331,8 +336,12 @@ ParseArgv(int *argcPtr, char **argv, ArgvInfo *argTable, int flags)
          break;
       }
       case ARGV_GENFUNC: {
+<<<<<<< HEAD
          typedef int (*handlerProcType)(void*, const char*, int, char**);
          handlerProcType handlerProc = (handlerProcType)(uintptr_t)infoPtr->src;
+=======
+         int (*handlerProc)(void*, const char*, int, char**) = (int (*)(void*, const char*, int, char**))(uintptr_t)infoPtr->src;
+>>>>>>> Fixed clang -Wdeprecated-non-prototype warnings
 
          argc = (*handlerProc)(infoPtr->dst, infoPtr->key,
                                argc, argv+srcIndex);