Removing redundant statuscmds logic when both statuscmd and dwmblocks patches are applied

config.def.h

@@ -690,11 +690,11 @@ static const char *dmenucmd[] = {
 };
 static const char *termcmd[]  = { "st", NULL };
 
-#if STATUSCMD_PATCH
+#if STATUSCMD_PATCH && !DWMBLOCKS_PATCH
 /* commands spawned when clicking statusbar, the mouse button pressed is exported as BUTTON */
 static const char *statuscmds[] = { "notify-send Mouse$BUTTON" };
 static char *statuscmd[] = { "/bin/sh", "-c", NULL, NULL };
-#endif // STATUSCMD_PATCH
+#endif // STATUSCMD_PATCH | DWMBLOCKS_PATCH
 
 #if SCRATCHPAD_ALT_1_PATCH
 static const unsigned scratchpad_mask = 1u << sizeof tags / sizeof * tags;

dwm.c

@@ -3184,14 +3184,14 @@ sigchld(int unused)
 void
 spawn(const Arg *arg)
 {
-	#if STATUSCMD_PATCH
+	#if STATUSCMD_PATCH && !DWMBLOCKS_PATCH
 	char *cmd = NULL;
-	#endif // STATUSCMD_PATCH
+	#endif // STATUSCMD_PATCH | DWMBLOCKS_PATCH
 	#if !NODMENU_PATCH
 	if (arg->v == dmenucmd)
 		dmenumon[0] = '0' + selmon->num;
 	#endif // NODMENU_PATCH
-	#if STATUSCMD_PATCH
+	#if STATUSCMD_PATCH && !DWMBLOCKS_PATCH
 	#if !NODMENU_PATCH
 	else if (arg->v == statuscmd)
 	#else
@@ -3206,7 +3206,7 @@ spawn(const Arg *arg)
 		cmd[LENGTH(statusexport)-3] = '0' + lastbutton;
 		statuscmd[2] = cmd;
 	}
-	#endif // STATUSCMD_PATCH
+	#endif // STATUSCMD_PATCH | DWMBLOCKS_PATCH
 
 	if (fork() == 0) {
 		if (dpy)
@@ -3251,9 +3251,9 @@ spawn(const Arg *arg)
 		perror(" failed");
 		exit(EXIT_SUCCESS);
 	}
-	#if STATUSCMD_PATCH
+	#if STATUSCMD_PATCH && !DWMBLOCKS_PATCH
 	free(cmd);
-	#endif // STATUSCMD_PATCH
+	#endif // STATUSCMD_PATCH | DWMBLOCKS_PATCH
 }
 
 void

patch/statuscmd.c

@@ -1,6 +1,8 @@
 static char rawstext[256];
 static const char statusexport[] = "export BUTTON=-;";
+#if !DWMBLOCKS_PATCH
 static int statuscmdn;
+#endif // DWMBLOCKS_PATCH
 static int lastbutton;
 
 void
@@ -14,4 +16,4 @@ copyvalidchars(char *text, char *rawtext)
 		}
 	}
 	text[j] = '\0';
-}
+}