Skip to content

Commit edd42df

Browse files
authored
Merge pull request #3295 from BsAtHome/fix_rtai-conv-components
Fix incompatibility between uspace and rtai build
2 parents 6071a81 + a63684d commit edd42df

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/hal/components/conv.comp.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ license "GPL";
88
author "Jeff Epler";
99

1010
;;
11-
#include <stdint.h>
11+
#include <rtapi_stdint.h>
1212
FUNCTION(_) {
1313
@TYPI@ val = in;
1414
@CC@ if(clamp) {

src/hal/components/mkconv.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ utype() {
2323
maxval() {
2424
case "$1" in
2525
"bit") echo "1" ;;
26-
"s32") echo "INT32_MAX" ;;
27-
"u32") echo "UINT32_MAX" ;;
28-
"s64") echo "INT64_MAX" ;;
29-
"u64") echo "UINT64_MAX" ;;
26+
"s32") echo "RTAPI_INT32_MAX" ;;
27+
"u32") echo "RTAPI_UINT32_MAX" ;;
28+
"s64") echo "RTAPI_INT64_MAX" ;;
29+
"u64") echo "RTAPI_UINT64_MAX" ;;
3030
"float") echo "Never_Used" ;;
3131
*) echo "This_Will_Generate_An_Error" ;;
3232
esac
@@ -36,9 +36,9 @@ maxval() {
3636
minval() {
3737
case "$1" in
3838
"bit") echo "0" ;;
39-
"s32") echo "INT32_MIN" ;;
39+
"s32") echo "RTAPI_INT32_MIN" ;;
4040
"u32") echo "0" ;;
41-
"s64") echo "INT64_MIN" ;;
41+
"s64") echo "RTAPI_INT64_MIN" ;;
4242
"u64") echo "0" ;;
4343
"float") echo "Never_Used" ;;
4444
*) echo "This_Will_Generate_An_Error" ;;

0 commit comments

Comments
 (0)