From 15ec30209592ec9e418c6375c8c730d20bc8997b Mon Sep 17 00:00:00 2001
From: "Mohamed A. Bamakhrama" <mohamed@alumni.tum.de>
Date: Mon, 3 Aug 2020 23:19:23 +0200
Subject: [PATCH] Define S_IREAD|IWRITE macros using IRUSR|IWUSR

On platforms such as Android, legacy macros are no longer defined.
Hence, we define them in terms of the new POSIX macros if the new ones are defined. Otherwise, we throw an error.

Signed-off-by: Mohamed A. Bamakhrama <mohamed@alumni.tum.de>
Signed-off-by: Miodrag Milanovic <mmicko@gmail.com>
(cherry picked from commit e792072f8a6f016eb5f2c8653f261ba7c88e6392)
---
 src/misc/util/utilFile.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/misc/util/utilFile.c b/src/misc/util/utilFile.c
index 4bb2f4c68..b096cabb6 100644
--- a/src/misc/util/utilFile.c
+++ b/src/misc/util/utilFile.c
@@ -25,6 +25,23 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
+// Handle legacy macros
+#if !defined(S_IREAD)
+#if defined(S_IRUSR)
+#define S_IREAD S_IRUSR
+#else
+#error S_IREAD is undefined
+#endif
+#endif
+
+#if !defined(S_IWRITE)
+#if defined(S_IWUSR)
+#define S_IWRITE S_IWUSR
+#else
+#error S_IWRITE is undefined
+#endif
+#endif
+
 #if defined(_MSC_VER) || defined(__MINGW32__)
 #include <windows.h>
 #include <process.h>