[newlib-cygwin] Cygwin: testsuite: Fix TEST_RETURN for 64-bit
Jon TURNEY
jturney@sourceware.org
Mon Aug 29 16:54:41 GMT 2022
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=19b3b814bcba422fa468530a441c0001361aed3c
commit 19b3b814bcba422fa468530a441c0001361aed3c
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Nov 26 15:33:44 2020 +0000
Cygwin: testsuite: Fix TEST_RETURN for 64-bit
The result of a function call won't fit in an int if it's e.g. a pointer.
Diff:
---
winsup/testsuite/libltp/include/usctest.h | 6 +++---
winsup/testsuite/libltp/lib/parse_opts.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/winsup/testsuite/libltp/include/usctest.h b/winsup/testsuite/libltp/include/usctest.h
index 6a095db1c..fef349d04 100644
--- a/winsup/testsuite/libltp/include/usctest.h
+++ b/winsup/testsuite/libltp/include/usctest.h
@@ -159,7 +159,7 @@ struct usc_errno_t {
**********************************************************************/
#ifdef _USC_LIB_
-extern int TEST_RETURN;
+extern long TEST_RETURN;
extern int TEST_ERRNO;
#else
@@ -173,7 +173,7 @@ extern struct usc_errno_t TEST_VALID_ENO[USC_MAX_ERRNO];
* Globals for returning the return code and errno from the system call
* test macros.
***********************************************************************/
-extern int TEST_RETURN;
+extern long TEST_RETURN;
extern int TEST_ERRNO;
/***********************************************************************
@@ -210,7 +210,7 @@ extern void STD_opts_help();
* SCALL = system call and parameters to execute
*
***********************************************************************/
-#define TEST(SCALL) TEST_RETURN = (unsigned) SCALL; TEST_ERRNO=errno;
+#define TEST(SCALL) TEST_RETURN = SCALL; TEST_ERRNO=errno;
/***********************************************************************
* TEST_VOID: calls a system call
diff --git a/winsup/testsuite/libltp/lib/parse_opts.c b/winsup/testsuite/libltp/lib/parse_opts.c
index 0282a0976..1f41bfdd2 100644
--- a/winsup/testsuite/libltp/lib/parse_opts.c
+++ b/winsup/testsuite/libltp/lib/parse_opts.c
@@ -110,7 +110,7 @@ struct usc_errno_t TEST_VALID_ENO[USC_MAX_ERRNO];
* Globals for returning the return code and errno from the system call
* test macros.
***********************************************************************/
-int TEST_RETURN;
+long TEST_RETURN;
int TEST_ERRNO;
/***********************************************************************
More information about the Cygwin-cvs
mailing list