darshan-runtime: fix compile warning of shadowing a previous local [-Wshadow]

* make variable __darshan_disabled a locally global in each file
  referring to it.

Author: wkliao

darshan-runtime/lib/darshan.h

@@ -172,6 +172,8 @@ extern pthread_mutex_t __darshan_core_mutex;
 /* macros for declaring wrapper functions and calling MPI routines
  * consistently regardless of whether static or dynamic linking is used
  */
+static int __darshan_disabled;
+
 #ifdef DARSHAN_PRELOAD
 
 #include <dlfcn.h>
@@ -205,7 +207,7 @@ extern pthread_mutex_t __darshan_core_mutex;
             exit(1); \
        } \
     } \
-    int __darshan_disabled = darshan_core_disabled_instrumentation();
+    __darshan_disabled = darshan_core_disabled_instrumentation();
 #else
 
 #define DARSHAN_FORWARD_DECL(__name,__ret,__args) \
@@ -224,7 +226,7 @@ extern pthread_mutex_t __darshan_core_mutex;
     __ret __wrap_ ## __func __args __attribute__ ((alias ("__wrap_" #__fcall)));
 
 #define MAP_OR_FAIL(__func) \
-    int __darshan_disabled = darshan_core_disabled_instrumentation()
+    __darshan_disabled = darshan_core_disabled_instrumentation()
 
 #endif
 

modules/apmpi.patch

@@ -1,6 +1,15 @@
 --- darshan-apmpi.c.orig	2025-10-03 14:11:57.395296967 -0500
-+++ darshan-apmpi.c	2025-10-03 14:22:12.684565527 -0500
-@@ -29,14 +29,16 @@
++++ darshan-apmpi.c	2025-10-04 12:03:16.352785800 -0500
+@@ -19,6 +19,8 @@
+ #include "darshan-dynamic.h"
+ #include "darshan-apmpi-log-format.h"
+
++static int __darshan_disabled;
++
+ typedef long long ap_bytes_t;
+ #define MAX(x,y) ((x>y)?x:y)
+ #define MIN(x,y) ((x==0.0)?y:((x<y)?x:y))
+@@ -29,14 +31,16 @@
  #define TIME_SYNC(FUNC) \
            double tm1, tm2, tm3, tdiff, tsync;\
            int ret; \