From 566dd4c8e9edd62a660f025327f5380397659632 Mon Sep 17 00:00:00 2001 From: netblue30 Date: Sat, 8 Aug 2020 09:37:30 -0400 Subject: fix for older gcc compilerss --- configure | 14 +------------- src/firejail/output.c | 3 ++- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/configure b/configure index e6d66a5a3..d2dd32ffc 100755 --- a/configure +++ b/configure @@ -682,7 +682,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -775,7 +774,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1028,15 +1026,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1174,7 +1163,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1327,7 +1316,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] diff --git a/src/firejail/output.c b/src/firejail/output.c index f7e6856dd..b92615f88 100644 --- a/src/firejail/output.c +++ b/src/firejail/output.c @@ -122,7 +122,8 @@ void check_output(int argc, char **argv) { } bool found_separator = false; /* copy argv into args, but drop --output(-stderr) arguments */ - for (int i = 0, j = 0; i < argc; i++) { + int j; + for (i = 0, j = 0; i < argc; i++) { if (!found_separator && i > 0) { if (strncmp(argv[i], "--output=", 9) == 0) { continue; -- cgit v1.2.3-54-g00ecf