From c50d8574429e94dd581ba4455145d84f2f0edce4 Mon Sep 17 00:00:00 2001
From: Aaron Viets <aaron.viets@ligo.org>
Date: Thu, 26 Sep 2024 10:38:04 -0700
Subject: [PATCH] Fix build error in gstlal_stdev.c
---
gnuscripts/depcomp | 15 ++++++++-------
gst/lal/gstlal_stdev.c | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/gnuscripts/depcomp b/gnuscripts/depcomp
index 715e34311..1f0aa972c 100755
--- a/gnuscripts/depcomp
+++ b/gnuscripts/depcomp
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2024-06-19.01; # UTC
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -47,11 +47,13 @@ Environment variables:
libtool Whether libtool is used (yes/no).
Report bugs to <bug-automake@gnu.org>.
+GNU Automake home page: <https://www.gnu.org/software/automake/>.
+General help using GNU software: <https://www.gnu.org/gethelp/>.
EOF
exit $?
;;
-v | --v*)
- echo "depcomp $scriptversion"
+ echo "depcomp (GNU Automake) $scriptversion"
exit $?
;;
esac
@@ -113,7 +115,6 @@ nl='
# These definitions help.
upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
lower=abcdefghijklmnopqrstuvwxyz
-digits=0123456789
alpha=${upper}${lower}
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
@@ -128,7 +129,7 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
-# Avoid interferences from the environment.
+# Avoid interference from the environment.
gccflag= dashmflag=
# Some modes work just like other modes, but use different flags. We
@@ -198,8 +199,8 @@ gcc3)
;;
gcc)
-## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
-## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## Note that this doesn't just cater to obsolete pre-3.x GCC compilers.
+## but also to in-use compilers like IBM xlc/xlC and the HP C compiler.
## (see the conditional assignment to $gccflag above).
## There are various ways to get dependency output from gcc. Here's
## why we pick this rather obscure method:
diff --git a/gst/lal/gstlal_stdev.c b/gst/lal/gstlal_stdev.c
index ec8c4f0ae..69ef5c34d 100644
--- a/gst/lal/gstlal_stdev.c
+++ b/gst/lal/gstlal_stdev.c
@@ -983,7 +983,7 @@ static void set_property(GObject *object, enum property prop_id, const GValue *v
case ARG_MIN_ARRAY_SIZE:
element->min_array_size = g_value_get_uint64(value);
break;
- case ARG_RESET_TIME:
+ case ARG_RESET_TIME: ;
guint64 old_reset_time, new_reset_time = g_value_get_uint64(value);
guint i = 0;
/* Only store nonzero reset times that we don't already have */
--
GitLab