Solaris 'compile hell' stuff...

[netatalk.git] / include / atalk / adouble.h

diff --git a/include/atalk/adouble.h b/include/atalk/adouble.h
index e87e086f42eb47681ac312e2a2b9b9e4b691b0f7..8f137032187299f2d13e6705a4ca1d4d0518fa98 100644 (file)
--- a/include/atalk/adouble.h
+++ b/include/atalk/adouble.h
@@ -1,5 +1,5 @@
 /*
- * $Id: adouble.h,v 1.21.6.2 2003-10-17 00:01:12 didg Exp $
+ * $Id: adouble.h,v 1.21.6.12 2004-02-20 20:53:14 bfernhomberg Exp $
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
  *
@@ -41,31 +41,37 @@
 #endif
 
 #ifdef HAVE_PWRITE
-
 #ifndef HAVE_PREAD
 #undef HAVE_PWRITE
 #endif
-
 #endif
 
-#ifdef  HAVE_PREAD
+#if defined(HAVE_PREAD) && !defined(SOLARIS)
+#ifdef _XOPEN_SOURCE
+#undef _XOPEN_SOURCE
+#endif
 #define _XOPEN_SOURCE 500
 #endif
 
+#include <sys/types.h>
+#include <sys/stat.h>
+
 #ifdef HAVE_UNISTD_H
 #undef __USE_MISC
 #define __USE_MISC
 #include <unistd.h>
 #endif 
 
+#include <sys/cdefs.h>
+
 #ifdef HAVE_FCNTL_H  
 #include <fcntl.h>
 #endif
 
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/mman.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
 #include <netatalk/endian.h>
 
 /* version info */
@@ -99,11 +105,13 @@
 #define ADEID_PRIVDEV           16
 #define ADEID_PRIVINO           17
 #define ADEID_PRIVSYN           18 /* in synch with database */
+#define ADEID_PRIVID            19
 
 #define AD_DEV                  0x80444556
 #define AD_INO                  0x80494E4F
 #define AD_SYN                  0x8053594E
-#define ADEID_MAX              19
+#define AD_ID                   0x8053567E
+#define ADEID_MAX              20
 #endif
 
 /* magic */
@@ -140,9 +148,10 @@
 #define ADEDLEN_PRIVDEV         8
 #define ADEDLEN_PRIVINO         8
 #define ADEDLEN_PRIVSYN         8
+#define ADEDLEN_PRIVID          4
 
-#define ADEID_NUM_V1         5 
-#define ADEID_NUM_V2         12  
+#define ADEID_NUM_V1         5
+#define ADEID_NUM_V2         13
 
 /* 589 */
 #define AD_DATASZ1      (AD_HEADER_LEN + ADEDLEN_NAME + ADEDLEN_COMMENT +ADEDLEN_FILEI +ADEDLEN_FINDERI+\
@@ -153,10 +162,15 @@ ADEID_NUM_V1*AD_ENTRY_LEN)
 #endif
 
 #define AD_NEWSZ2       (ADEDLEN_DID + ADEDLEN_AFPFILEI +ADEDLEN_SHORTNAME +ADEDLEN_PRODOSFILEI \
-+ADEDLEN_PRIVDEV +ADEDLEN_PRIVINO +ADEDLEN_PRIVSYN)
++ADEDLEN_PRIVDEV +ADEDLEN_PRIVINO +ADEDLEN_PRIVSYN+ ADEDLEN_PRIVID)
 
 /* 725 */
-#define AD_DATASZ2      (AD_DATASZ1 + (ADEID_NUM_V2 -ADEID_NUM_V1)*AD_ENTRY_LEN)
+#define AD_DATASZ2      (AD_DATASZ1 + AD_NEWSZ2 + (ADEID_NUM_V2 -ADEID_NUM_V1)*AD_ENTRY_LEN)
+
+#if AD_DATASZ2 != 741
+#error bad size for AD_DATASZ2
+#endif
+
 #define AD_DATASZ_MAX   1024
 #if AD_VERSION == AD_VERSION1
 #define AD_DATASZ      AD_DATASZ1 /* hold enough for the entries */
@@ -352,6 +366,9 @@ extern int ad_stat    __P((const char *, struct stat *));
 /* extend header to RW if R or W (W if R for locking),
  */ 
 #ifndef ATACC
+#ifndef __inline__
+#define __inline__
+#endif
 static __inline__ mode_t ad_hf_mode (mode_t mode)
 {
     /* fnctl lock need write access */
@@ -409,7 +426,7 @@ extern int ad_setattr __P((const struct adouble *, const u_int16_t));
 extern int ad_getattr __P((const struct adouble *, u_int16_t *));
 
 #if AD_VERSION == AD_VERSION2
-extern int ad_setid __P((struct adouble *, const struct stat *, const u_int32_t, const void *));
+extern int ad_setid __P((struct adouble *, const dev_t dev,const ino_t ino, const u_int32_t, const u_int32_t, const void *));
 #else
 #define ad_setid(a, b, c)
 #endif