Merge branch 'geany:master' into devhelpplugin

liomarhora · Mar 4, 2024 · 54a4faf · 54a4faf
2 parents 8fa6ef6 + c8da14a
commit 54a4faf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/build/cppcheck-geany-plugins.cfg b/build/cppcheck-geany-plugins.cfg
@@ -1,5 +1,11 @@
 <?xml version="1.0"?>
 <def format="2">
+  <!-- Geany-Plugins macros -->
+  <define name="PLUGIN" value="&quot;foo&quot;"/>
+  <!-- GLib macros -->
+  <define name="G_GSSIZE_FORMAT" value="&quot;li&quot;"/>
+  <define name="G_GINT64_MODIFIER" value="&quot;l&quot;"/>
+  <define name="G_DIR_SEPARATOR_S" value="&quot;/&quot;"/>
   <define name="G_DEFINE_TYPE(TN, t_n, T_P)" value=""/>
   <define name="G_DEFINE_BOXED_TYPE(TypeName,type_name,copy_func,free_func)" value=""/>
 </def>
diff --git a/build/cppcheck.mk b/build/cppcheck.mk
@@ -3,7 +3,7 @@ if HAVE_CPPCHECK
 
 check-cppcheck: $(srcdir)
 	$(CPPCHECK) \
-		-q --template gcc --error-exitcode=2 \
+		-q --template=gcc --error-exitcode=2 \
 		--library=$(top_srcdir)/build/cppcheck-geany-plugins.cfg \
 		-I$(GEANY_INCLUDEDIR)/geany \
 		$(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \