From 04bf4ba9b5ce09fdae7a5c61821d7f0da88917db Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 16 1月 2023 23:39:35 +0800
Subject: [PATCH] Fix support for C89 and C99
---
libscpi/src/ieee488.c | 11 ++++++-----
.github/workflows/main.yml | 16 ++++++++--------
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5c49ed6..e7bf010 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -34,15 +34,15 @@
LDFLAGS: -g -fsanitize=address
run: make clean test
-# - name: gcc-c89
-# env:
-# CFLAGS: -std=c89
-# run: make clean all test
+ - name: gcc-c89
+ env:
+ CFLAGS: -std=c89
+ run: make clean all test
-# - name: gcc-c90
-# env:
-# CFLAGS: -std=c90
-# run: make clean all test
+ - name: gcc-c90
+ env:
+ CFLAGS: -std=c90
+ run: make clean all test
- name: gcc-c99
env:
diff --git a/libscpi/src/ieee488.c b/libscpi/src/ieee488.c
index 000df89..f95b45e 100644
--- a/libscpi/src/ieee488.c
+++ b/libscpi/src/ieee488.c
@@ -73,7 +73,7 @@
SCPI_REG_NONE,
SCPI_REG_NONE,
0
- }, //SCPI_REG_GROUP_STB
+ }, /* SCPI_REG_GROUP_STB */
{
SCPI_REG_ESR,
SCPI_REG_ESE,
@@ -82,7 +82,7 @@
SCPI_REG_NONE,
SCPI_REG_STB,
STB_ESR
- }, //SCPI_REG_GROUP_ESR
+ }, /* SCPI_REG_GROUP_ESR */
{
SCPI_REG_OPER,
SCPI_REG_OPERE,
@@ -91,7 +91,7 @@
SCPI_REG_NONE,
SCPI_REG_STB,
STB_OPS
- }, //SCPI_REG_GROUP_OPER
+ }, /* SCPI_REG_GROUP_OPER */
{
SCPI_REG_QUES,
SCPI_REG_QUESE,
@@ -100,7 +100,7 @@
SCPI_REG_NONE,
SCPI_REG_STB,
STB_QES
- }, //SCPI_REG_GROUP_QUES
+ }, /* SCPI_REG_GROUP_QUES */
#if USE_CUSTOM_REGISTERS
#ifndef USER_REGISTER_GROUP_DETAILS
@@ -261,7 +261,8 @@
*/
scpi_result_t SCPI_CoreCls(scpi_t * context) {
SCPI_ErrorClear(context);
- for (int i = 0; i < SCPI_REG_GROUP_COUNT; ++i) {
+ int i;
+ for (i = 0; i < SCPI_REG_GROUP_COUNT; ++i) {
scpi_reg_name_t event_reg = scpi_reg_group_details[i].event;
if (event_reg != SCPI_REG_STB) {
SCPI_RegSet(context, event_reg, 0);
--
Gitblit v1.9.1