X-Git-Url: https://yaffs.net/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyportenv.h;h=d931f8127525bfe96c2b98a105ccc752fd9b462e;hp=abc761b6e8c508be860e535730db8c6b10a1535d;hb=1f3d64d1d804fef6715126dead54bf30b176c67e;hpb=8c97c553cb1f3adbb0b7d5393b32885fae2eb90d

diff --git a/direct/yportenv.h b/direct/yportenv.h
index abc761b..d931f81 100644
--- a/direct/yportenv.h
+++ b/direct/yportenv.h
@@ -1,8 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2011 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *
@@ -23,6 +22,8 @@
 typedef unsigned char u8;
 typedef unsigned short u16;
 typedef unsigned int u32;
+typedef unsigned long long u64;
+typedef signed int s32;
 #endif
 
 
@@ -248,15 +249,41 @@ struct iattr {
 #define S_IFREG		0100000
 #endif
 
+#ifndef S_ISSOCK
 #define S_ISSOCK(m)	(((m) & S_IFMT) == S_IFSOCK)
+#endif
+#ifndef S_ISLNK
 #define S_ISLNK(m)	(((m) & S_IFMT) == S_IFLNK)
+#endif
+#ifndef S_ISDIR
 #define S_ISDIR(m)	(((m) & S_IFMT) == S_IFDIR)
+#endif
+#ifndef S_ISREG
 #define S_ISREG(m)	(((m) & S_IFMT) == S_IFREG)
+#endif
+#ifndef S_ISBLK
 #define S_ISBLK(m)	(((m) & S_IFMT) == S_IFBLK)
+#endif
+#ifndef S_ISCHR
 #define S_ISCHR(m)	(((m) & S_IFMT) == S_IFCHR)
+#endif
+#ifndef S_ISFIFO
 #define S_ISFIFO(m)	(((m) & S_IFMT) == S_IFIFO)
+#endif
 
 
+#ifndef S_IRUSR
+#define S_IRUSR		0000400
+#endif
+
+#ifndef S_IWUSR
+#define	S_IWUSR		0000200
+#endif
+
+#ifndef S_IXUSR
+#define	S_IXUSR		0000100
+#endif
+
 #ifndef S_IREAD
 #define S_IREAD		0000400
 #endif
@@ -269,6 +296,16 @@ struct iattr {
 #define	S_IEXEC	0000100
 #endif
 
+
+#else
+#include <errno.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#endif
+
+#endif
+
+/* Create some less common define values if they don't exist */
 #ifndef XATTR_CREATE
 #define XATTR_CREATE 1
 #endif
@@ -284,12 +321,8 @@ struct iattr {
 #define F_OK	0
 #endif
 
-#else
-#include <errno.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#endif
-
+#ifndef S_ISSOCK
+#define S_ISSOCK(m)	(((m) & S_IFMT) == S_IFSOCK)
 #endif
 
 #ifndef Y_DUMP_STACK