GerbilSoft/rom-properties
1
Fork 0
mirror of https://github.com/GerbilSoft/rom-properties.git synced 2025-06-18 19:45:41 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[gtk] gtk-compat.h: Use NULL instead of nullptr.

Browse Source 
This breaks in the C PCH build.
This commit is contained in:
David Korth 2022-05-22 14:37:23 -04:00
parent 530d503b03
commit 1ac66c2d91
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
rom-properties (1.9-1ppa1~xenial2) xenial; urgency=medium
* Fix undefined 'nullptr' in gtk-compat.h in C PCH builds.
-- David Korth <gerbilsoft@gerbilsoft.com> Sun, 22 May 2022 14:37:00 -0400
rom-properties (1.9-1ppa1~xenial1) xenial; urgency=medium
* 1.9 release.

4
src/gtk/gtk-compat.h
View File

@ -148,7 +148,7 @@ GTK_WIDET_GET_TOPLEVEL_FN(dialog, GtkDialog, GTK_DIALOG)
static inline GtkWidget*
gtk_widget_get_first_child(GtkWidget *widget)
{
GtkWidget *ret = nullptr;
GtkWidget *ret = NULL;
// Assuming this is a GtkContainer.
assert(GTK_IS_CONTAINER(widget));
@ -158,7 +158,7 @@ gtk_widget_get_first_child(GtkWidget *widget)
// NOTE: First widget in the list matches the first widget in the
// UI file, contrary to the bitfield stuff in RomDataView...
GList *const widgetIter = g_list_first(widgetList);
assert(widgetIter != nullptr);
assert(widgetIter != NULL);
if (widgetIter)
ret = GTK_WIDGET(widgetIter->data);
g_list_free(widgetList);