Merge pull request #3295 from BsAtHome/fix_rtai-conv-components

Fix incompatibility between uspace and rtai build
LinuxCNC · Jan 23, 2025 · edd42df · edd42df
2 parents 6071a81 + a63684d
commit edd42df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/hal/components/conv.comp.in b/src/hal/components/conv.comp.in
@@ -8,7 +8,7 @@ license "GPL";
 author "Jeff Epler";
 
 ;;
-#include <stdint.h>
+#include <rtapi_stdint.h>
 FUNCTION(_) {
 	@TYPI@ val = in;
 @CC@	if(clamp) {

diff --git a/src/hal/components/mkconv.sh b/src/hal/components/mkconv.sh
@@ -23,10 +23,10 @@ utype() {
 maxval() {
 	case "$1" in
 	"bit")	echo "1" ;;
-	"s32")	echo "INT32_MAX" ;;
-	"u32")	echo "UINT32_MAX" ;;
-	"s64")	echo "INT64_MAX" ;;
-	"u64")	echo "UINT64_MAX" ;;
+	"s32")	echo "RTAPI_INT32_MAX" ;;
+	"u32")	echo "RTAPI_UINT32_MAX" ;;
+	"s64")	echo "RTAPI_INT64_MAX" ;;
+	"u64")	echo "RTAPI_UINT64_MAX" ;;
 	"float") echo "Never_Used" ;;
 	*)	echo "This_Will_Generate_An_Error" ;;
 	esac
@@ -36,9 +36,9 @@ maxval() {
 minval() {
 	case "$1" in
 	"bit")	echo "0" ;;
-	"s32")	echo "INT32_MIN" ;;
+	"s32")	echo "RTAPI_INT32_MIN" ;;
 	"u32")	echo "0" ;;
-	"s64")	echo "INT64_MIN" ;;
+	"s64")	echo "RTAPI_INT64_MIN" ;;
 	"u64")	echo "0" ;;
 	"float") echo "Never_Used" ;;
 	*)	echo "This_Will_Generate_An_Error" ;;