[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs dir.h,1.15,1.16 volume.h,1.22,1.23

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

Changes by: cha0smaster

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

Modified Files:
	dir.h volume.h 
Log Message:
should fix build under Solaris


Index: dir.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/dir.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- dir.h	10 Nov 2005 18:13:16 -0000	1.15
+++ dir.h	8 Jan 2006 15:53:27 -0000	1.16
@@ -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
@@ -74,6 +74,11 @@ extern int ntfs_link(ntfs_inode *ni, ntf
 #define NTFS_DT_SOCK		12
 #define NTFS_DT_WHT		14
 
+/* DJGPP do not know about this. */
+#ifndef S_IFREG
+
+#endif
+
 /*
  * This is the "ntfs_filldir" function type, used by ntfs_readdir() to let
  * the caller specify what kind of dirent layout it wants to have.

Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/volume.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- volume.h	24 Nov 2005 14:23:38 -0000	1.22
+++ volume.h	8 Jan 2006 15:53:28 -0000	1.23
@@ -2,7 +2,7 @@
  * volume.h - Exports for NTFS volume handling. Part of the Linux-NTFS project.
  *
  * Copyright (c) 2000-2004 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
@@ -45,14 +45,19 @@
  * Under Cygwin, DJGPP and FreeBSD we do not have MS_RDONLY and MS_NOATIME,
  * so we define them ourselves.
  */
-#if !defined(MS_RDONLY)
-/**
- * enum MS_MOUNT -
+#ifndef MS_RDONLY
+#define MS_RDONLY 1
+#endif
+/*
+ * Solaris defines MS_RDONLY but not MS_NOATIME thus we need to carefully
+ * define MS_NOATIME.
  */
-typedef enum {
-	MS_RDONLY = 1,
-	MS_NOATIME,
-} MS_MOUNT;
+#ifndef MS_NOATIME
+#if (MS_RDONLY != 1)
+#	define MS_NOATIME 1
+#else
+#	define MS_NOATIME 2
+#endif
 #endif
 
 /* Forward declaration */