[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs dir.h,1.17,1.18

[Yura P. <cha...@us...>]

Changes by: cha0smaster

Update of /cvsroot/linux-ntfs/ntfsprogs/include/ntfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14686/include/ntfs

Modified Files:
	dir.h 
Log Message:
tidy up djgpp S_IF{SOCK,LNK} fix


Index: dir.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/dir.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- dir.h	8 Jan 2006 15:56:03 -0000	1.17
+++ dir.h	30 Jan 2006 22:10:31 -0000	1.18
@@ -2,7 +2,7 @@
  * dir.h - Exports for directory handling. Part of the Linux-NTFS project.
  *
  * Copyright (c) 2002 Anton Altaparmakov
- * Copyright (c) 2005 Yura Pakhuchiy
+ * Copyright (c) 2005-2006 Yura Pakhuchiy
  * Copyright (c) 2004-2005 Richard Russon
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -32,7 +32,27 @@
 #define MAX_PATH 1024
 #endif
 
-/* The little endian Unicode strings $I30, $SII, $SDH, $O, $Q, $R
+/*
+ * We do not have these under DJGPP, so define our version that do not conflict
+ * with other S_IFs defined under DJGPP.
+ */
+#ifdef DJGPP
+#ifndef S_IFLNK
+#define S_IFLNK  0120000
+#endif
+#ifndef S_ISLNK
+#define S_ISLNK(m)  (((m) & S_IFMT) == S_IFLNK)
+#endif
+#ifndef S_IFSOCK
+#define S_IFSOCK 0140000
+#endif
+#ifndef S_ISSOCK
+#define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK)
+#endif
+#endif
+
+/*
+ * The little endian Unicode strings $I30, $SII, $SDH, $O, $Q, $R
  * as a global constant.
  */
 extern ntfschar NTFS_INDEX_I30[5];