Skip to content

Commit d4fb577

Browse files
authored
Merge pull request #163 from dimkr/gcc14
Fix build failure with GCC 14
2 parents 6e46ac6 + db9b334 commit d4fb577

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
image: ["ubuntu:noble", "ubuntu:jammy", "ubuntu:focal"]
10+
image: ["debian:trixie-slim", "ubuntu:noble", "ubuntu:jammy", "ubuntu:focal"]
1111
container:
1212
image: ${{ matrix.image }}
1313
env:

src/gtkdialog.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,8 @@ gint get_program_from_variable(gchar *name)
344344
static gint
345345
get_program_from_file(char *name)
346346
{
347-
int tmp, result;
347+
size_t tmp;
348+
ssize_t result;
348349

349350
PIP_DEBUG("Start.");
350351

src/signals.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1127,7 +1127,7 @@ void on_any_widget_file_changed_event(GFileMonitor *monitor, GFile *file,
11271127
#ifdef DEBUG_TRANSITS
11281128
fprintf(stderr, "%s(): Exiting.\n", __func__);
11291129
#endif
1130-
#if GTK_CHECK_VERSION(3,0,0)
1130+
#if HAVE_SYS_INOTIFY_H && GTK_CHECK_VERSION(3,0,0)
11311131
return TRUE;
11321132
#endif
11331133
}
@@ -1255,13 +1255,17 @@ void on_any_widget_auto_refresh_event(GFileMonitor *monitor, GFile *file,
12551255
break;
12561256
default:
12571257
fprintf(stderr, "%s(): Unhandled widget type.\n", __func__);
1258+
#if HAVE_SYS_INOTIFY_H && GTK_CHECK_VERSION(3,0,0)
12581259
return FALSE;
1260+
#else
1261+
return;
1262+
#endif
12591263
}
12601264

12611265
#ifdef DEBUG_TRANSITS
12621266
fprintf(stderr, "%s(): Exiting.\n", __func__);
12631267
#endif
1264-
#if GTK_CHECK_VERSION(3,0,0)
1268+
#if HAVE_SYS_INOTIFY_H && GTK_CHECK_VERSION(3,0,0)
12651269
return TRUE;
12661270
#endif
12671271
}

0 commit comments

Comments
 (0)