xnu-1228.tar.gz

[apple/xnu.git] / bsd / nfs / xdr_subs.h

diff --git a/bsd/nfs/xdr_subs.h b/bsd/nfs/xdr_subs.h
index f6bc3748e1909d2e76a86368d34b8d298330d1e7..be5c6444c81699a1be0d2fb94c587e8736b21118 100644 (file)
--- a/bsd/nfs/xdr_subs.h
+++ b/bsd/nfs/xdr_subs.h
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*
@@ -81,30 +87,6 @@
 #define        fxdr_unsigned(t, v)     ((t)ntohl((long)(v)))
 #define        txdr_unsigned(v)        (htonl((long)(v)))
 
-#define        fxdr_nfsv2time(f, t) { \
-       (t)->tv_sec = ntohl(((struct nfsv2_time *)(f))->nfsv2_sec); \
-       if (((struct nfsv2_time *)(f))->nfsv2_usec != 0xffffffff) \
-               (t)->tv_nsec = 1000 * ntohl(((struct nfsv2_time *)(f))->nfsv2_usec); \
-       else \
-               (t)->tv_nsec = 0; \
-}
-#define        txdr_nfsv2time(f, t) { \
-       ((struct nfsv2_time *)(t))->nfsv2_sec = htonl((f)->tv_sec); \
-       if ((f)->tv_nsec != -1) \
-               ((struct nfsv2_time *)(t))->nfsv2_usec = htonl((f)->tv_nsec / 1000); \
-       else \
-               ((struct nfsv2_time *)(t))->nfsv2_usec = 0xffffffff; \
-}
-
-#define        fxdr_nfsv3time(f, t) { \
-       (t)->tv_sec = ntohl(((struct nfsv3_time *)(f))->nfsv3_sec); \
-       (t)->tv_nsec = ntohl(((struct nfsv3_time *)(f))->nfsv3_nsec); \
-}
-#define        txdr_nfsv3time(f, t) { \
-       ((struct nfsv3_time *)(t))->nfsv3_sec = htonl((f)->tv_sec); \
-       ((struct nfsv3_time *)(t))->nfsv3_nsec = htonl((f)->tv_nsec); \
-}
-
 #define        fxdr_hyper(f, t) { \
        ((long *)(t))[_QUAD_HIGHWORD] = ntohl(((long *)(f))[0]); \
        ((long *)(t))[_QUAD_LOWWORD] = ntohl(((long *)(f))[1]); \