Skip to content

Commit ecb9e1c

Browse files
authored
Merge pull request #1535 from b4n/cppcheck-2.19
Fix CppCheck 2.19 support
2 parents 742ec58 + 6455a75 commit ecb9e1c

3 files changed

Lines changed: 8 additions & 1 deletion

File tree

build/cppcheck-geany-plugins.cfg

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,10 @@
44
<define name="G_GSSIZE_FORMAT" value="&quot;li&quot;"/>
55
<define name="G_GINT64_MODIFIER" value="&quot;l&quot;"/>
66
<define name="G_DIR_SEPARATOR_S" value="&quot;/&quot;"/>
7+
<!-- avoids undefined function-like macro invocation in 2.19
8+
See https://github.com/danmar/cppcheck/pull/8147 -->
9+
<define name="GDK_CHECK_VERSION(a,b,c)" value="1"/>
10+
<define name="GTK_CHECK_VERSION(a,b,c)" value="1"/>
11+
<define name="GLIB_CHECK_VERSION(a,b,c)" value="1"/>
12+
<define name="CAIRO_VERSION_ENCODE(a,b,c)" value="(((a)*10000)+((b)*100)+(c))"/>
713
</def>

debugger/src/dbm_gdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ static GList* add_to_queue(GList* queue, const gchar *message, const gchar *comm
295295
item->error_message = g_strdup(error_message);
296296
item->format_error_message = format_error_message;
297297

298-
return g_list_append(queue, (gpointer)item);
298+
return g_list_append(queue, item);
299299
}
300300

301301
/*

overview/overview/Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@ overview_la_CFLAGS = \
2626
overview_la_LIBADD = \
2727
$(COMMONLIBS)
2828

29+
AM_CPPCHECKFLAGS = --library=cairo
2930
include $(top_srcdir)/build/cppcheck.mk

0 commit comments

Comments
 (0)