[gcc r15-8476] modula2: Defend against no ENOTBLK definition
Gaius Mulley
gaius@gcc.gnu.org
Thu Mar 20 22:24:01 GMT 2025
https://gcc.gnu.org/g:53dcff73dab134be596036e6bdd35e7b9d7a302b
commit r15-8476-g53dcff73dab134be596036e6bdd35e7b9d7a302b
Author: Gaius Mulley <gaiusmod2@gmail.com>
Date: Thu Mar 20 22:23:38 2025 +0000
modula2: Defend against no ENOTBLK definition
This patch defends against no ENOTBLK definition.
libgm2/ChangeLog:
* libm2iso/ErrnoCategory.cc (IsErrnoHard): Defend against
lack of ENOTBLK.
(UnAvailable): Ditto.
(GetOpenResults): Ditto.
Signed-off-by: Gaius Mulley <gaiusmod2@gmail.com>
Diff:
---
libgm2/libm2iso/ErrnoCategory.cc | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/libgm2/libm2iso/ErrnoCategory.cc b/libgm2/libm2iso/ErrnoCategory.cc
index 053c75bb11ab..d1dcb155452f 100644
--- a/libgm2/libm2iso/ErrnoCategory.cc
+++ b/libgm2/libm2iso/ErrnoCategory.cc
@@ -50,7 +50,10 @@ EXPORT(IsErrnoHard) (int e)
{
#if defined(HAVE_ERRNO_H) || defined(HAVE_SYS_ERRNO_H)
return ((e == EPERM) || (e == ENOENT) || (e == EIO) || (e == ENXIO)
- || (e == EACCES) || (e == ENOTBLK) || (e == ENODEV) || (e == EINVAL)
+ || (e == EACCES) || (e == ENODEV) || (e == EINVAL)
+#ifdef ENOTBLK
+ || (e == ENOTBLK)
+#endif
|| (e == ENFILE) || (e == EROFS) || (e == EMLINK));
#else
return false;
@@ -79,7 +82,10 @@ EXPORT(UnAvailable) (int e)
{
#if defined(HAVE_ERRNO_H) || defined(HAVE_SYS_ERRNO_H)
return ((e == ENOENT) || (e == ESRCH) || (e == ENXIO) || (e == ECHILD)
- || (e == ENOTBLK) || (e == ENODEV) || (e == ENOTDIR));
+#ifdef ENOTBLK
+ || (e == ENOTBLK)
+#endif
+ || (e == ENODEV) || (e == ENOTDIR));
#else
return false;
#endif
@@ -108,9 +114,11 @@ EXPORT(GetOpenResults) (int e)
case EACCES:
return wrongPermissions;
break;
+#ifdef ENOTBLK
case ENOTBLK:
return wrongFileType;
break;
+#endif
case EEXIST:
return fileExists;
break;
More information about the Gcc-cvs
mailing list