Skip to content

Commit

Permalink
[gtk] gtk-compat.h: Use NULL instead of nullptr.
Browse files Browse the repository at this point in the history
This breaks in the C PCH build.
  • Loading branch information
GerbilSoft committed May 22, 2022
1 parent 530d503 commit 1ac66c2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -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 <[email protected]> Sun, 22 May 2022 14:37:00 -0400

rom-properties (1.9-1ppa1~xenial1) xenial; urgency=medium

* 1.9 release.
Expand Down
4 changes: 2 additions & 2 deletions src/gtk/gtk-compat.h
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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);
Expand Down

0 comments on commit 1ac66c2

Please sign in to comment.