Merge pull request #163 from dimkr/gcc14

Fix build failure with GCC 14
puppylinux-woof-CE · Sep 13, 2024 · d4fb577 · d4fb577
2 parents 6e46ac6 + db9b334
commit d4fb577
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        image: ["ubuntu:noble", "ubuntu:jammy", "ubuntu:focal"]
+        image: ["debian:trixie-slim", "ubuntu:noble", "ubuntu:jammy", "ubuntu:focal"]
     container:
       image: ${{ matrix.image }}
     env:

diff --git a/src/gtkdialog.c b/src/gtkdialog.c
@@ -344,7 +344,8 @@ gint get_program_from_variable(gchar *name)
 static gint 
 get_program_from_file(char *name)
 {
-	int tmp, result;
+	size_t tmp;
+	ssize_t result;
 
 	PIP_DEBUG("Start.");
 

diff --git a/src/signals.c b/src/signals.c
@@ -1127,7 +1127,7 @@ void on_any_widget_file_changed_event(GFileMonitor *monitor, GFile *file,
 #ifdef DEBUG_TRANSITS
 	fprintf(stderr, "%s(): Exiting.\n", __func__);
 #endif
-#if GTK_CHECK_VERSION(3,0,0)
+#if HAVE_SYS_INOTIFY_H && GTK_CHECK_VERSION(3,0,0)
 	return TRUE;
 #endif
 }
@@ -1255,13 +1255,17 @@ void on_any_widget_auto_refresh_event(GFileMonitor *monitor, GFile *file,
 			break;
 		default:
 			fprintf(stderr, "%s(): Unhandled widget type.\n", __func__);
+#if HAVE_SYS_INOTIFY_H && GTK_CHECK_VERSION(3,0,0)
 			return FALSE;
+#else
+			return;
+#endif
 	}
 
 #ifdef DEBUG_TRANSITS
 	fprintf(stderr, "%s(): Exiting.\n", __func__);
 #endif
-#if GTK_CHECK_VERSION(3,0,0)
+#if HAVE_SYS_INOTIFY_H && GTK_CHECK_VERSION(3,0,0)
 	return TRUE;
 #endif
 }