From 9291fbcb24900393ca947d2181a82be07a6f4b6f Mon Sep 17 00:00:00 2001
From: Anders Blomdell <anders.blomdell@control.lth.se>
Date: Thu, 24 Apr 2025 09:33:40 +0200
Subject: [PATCH] Remove incorrect parameter to moberg_new, use unversioned
java-devel
---
adaptors/java/src/se_lth_control_realtime_moberg_Moberg.c | 2 +-
adaptors/matlab/moberg4simulink.c | 2 +-
moberg.spec.template | 2 +-
moberg_tool.c | 4 ++--
test/test_io.c | 2 +-
test/test_start_stop.c | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/adaptors/java/src/se_lth_control_realtime_moberg_Moberg.c b/adaptors/java/src/se_lth_control_realtime_moberg_Moberg.c
index 769f423..206d78e 100644
--- a/adaptors/java/src/se_lth_control_realtime_moberg_Moberg.c
+++ b/adaptors/java/src/se_lth_control_realtime_moberg_Moberg.c
@@ -113,7 +113,7 @@ struct {
static int up()
{
if (g_moberg.count <= 0) {
- g_moberg.moberg = moberg_new(NULL);
+ g_moberg.moberg = moberg_new();
}
g_moberg.count++;
return 0;
diff --git a/adaptors/matlab/moberg4simulink.c b/adaptors/matlab/moberg4simulink.c
index 26a546d..5c257e2 100644
--- a/adaptors/matlab/moberg4simulink.c
+++ b/adaptors/matlab/moberg4simulink.c
@@ -59,7 +59,7 @@ struct {
static int up()
{
if (g_moberg.count <= 0) {
- g_moberg.moberg = moberg_new(NULL);
+ g_moberg.moberg = moberg_new();
}
g_moberg.count++;
return 0;
diff --git a/moberg.spec.template b/moberg.spec.template
index 62197cb..923fb33 100644
--- a/moberg.spec.template
+++ b/moberg.spec.template
@@ -14,7 +14,7 @@ BuildRequires: gcc
BuildRequires: comedilib-devel
BuildRequires: valgrind
BuildRequires: libxdg-basedir-devel
-BuildRequires: java-1.8.0-devel
+BuildRequires: java-devel
BuildRequires: pip
BuildRequires: python3-devel
BuildRequires: python3-build
diff --git a/moberg_tool.c b/moberg_tool.c
index 11a6b0c..846bfe4 100644
--- a/moberg_tool.c
+++ b/moberg_tool.c
@@ -11,11 +11,11 @@ int main(int argc, char *argv[])
{
if (argc == 2 && strcmp(argv[1], "--start") == 0) {
- struct moberg *moberg = moberg_new(NULL);
+ struct moberg *moberg = moberg_new();
moberg_start(moberg, stdout);
moberg_free(moberg);
} else if (argc == 2 && strcmp(argv[1], "--stop") == 0) {
- struct moberg *moberg = moberg_new(NULL);
+ struct moberg *moberg = moberg_new();
moberg_stop(moberg, stdout);
moberg_free(moberg);
} else if (argc == 2 && strcmp(argv[1], "-h") == 0) {
diff --git a/test/test_io.c b/test/test_io.c
index a730a2f..8296225 100644
--- a/test/test_io.c
+++ b/test/test_io.c
@@ -3,7 +3,7 @@
int main(int argc, char *argv[])
{
- struct moberg *moberg = moberg_new(NULL);
+ struct moberg *moberg = moberg_new();
if (! moberg) {
fprintf(stderr, "NEW failed\n");
goto out;
diff --git a/test/test_start_stop.c b/test/test_start_stop.c
index ee0a49a..41065a2 100644
--- a/test/test_start_stop.c
+++ b/test/test_start_stop.c
@@ -4,7 +4,7 @@
int main(int argc, char *argv[])
{
fprintf(stderr, "NEW\n");
- struct moberg *moberg = moberg_new(NULL);
+ struct moberg *moberg = moberg_new();
fprintf(stderr, "START:\n");
moberg_start(moberg, stdout);
fprintf(stderr, "STOP:\n");
--
GitLab