Libinfo-392.tar.gz

[apple/libinfo.git] / rpc.subproj / rpc_msg.h

diff --git a/rpc.subproj/rpc_msg.h b/rpc.subproj/rpc_msg.h
index afd0d6db402db057fca208608416e9403d08ae74..ec2d929c61f6eeef135315737484f4861c814f0f 100644 (file)
--- a/rpc.subproj/rpc_msg.h
+++ b/rpc.subproj/rpc_msg.h
@@ -3,22 +3,21 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * 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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * Portions Copyright (c) 1999 Apple Computer, Inc.  All Rights
+ * Reserved.  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 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.
  * 
  * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON- INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -52,7 +51,7 @@
  *
  *     from: @(#)rpc_msg.h 1.7 86/07/16 SMI
  *     from: @(#)rpc_msg.h     2.1 88/07/29 4.0 RPCSRC
- *     $Id: rpc_msg.h,v 1.2 1999/10/14 21:56:54 wsanchez Exp $
+ *     $Id: rpc_msg.h,v 1.3 2004/10/28 21:58:24 emoy Exp $
  */
 
 /*
@@ -65,8 +64,12 @@
 #ifndef _RPC_RPCMSG_H
 #define _RPC_RPCMSG_H
 
-#define RPC_MSG_VERSION                ((u_long) 2)
-#define RPC_SERVICE_PORT       ((u_short) 2048)
+#ifdef __LP64__
+#define RPC_MSG_VERSION                ((unsigned int) 2)
+#else
+#define RPC_MSG_VERSION                ((unsigned long) 2)
+#endif
+#define RPC_SERVICE_PORT       ((unsigned short) 2048)
 
 /*
  * Bottom up definition of an rpc message.
@@ -112,8 +115,13 @@ struct accepted_reply {
        enum accept_stat        ar_stat;
        union {
                struct {
-                       u_long  low;
-                       u_long  high;
+#ifdef __LP64__
+                       unsigned int low;
+                       unsigned int high;
+#else
+                       unsigned long low;
+                       unsigned long high;
+#endif
                } AR_versions;
                struct {
                        caddr_t where;
@@ -132,8 +140,13 @@ struct rejected_reply {
        enum reject_stat rj_stat;
        union {
                struct {
-                       u_long low;
-                       u_long high;
+#ifdef __LP64__
+                       unsigned int low;
+                       unsigned int high;
+#else
+                       unsigned long low;
+                       unsigned long high;
+#endif
                } RJ_versions;
                enum auth_stat RJ_why;  /* why authentication did not work */
        } ru;
@@ -158,10 +171,17 @@ struct reply_body {
  * Body of an rpc request call.
  */
 struct call_body {
-       u_long cb_rpcvers;      /* must be equal to two */
-       u_long cb_prog;
-       u_long cb_vers;
-       u_long cb_proc;
+#ifdef __LP64__
+       unsigned int cb_rpcvers;        /* must be equal to two */
+       unsigned int cb_prog;
+       unsigned int cb_vers;
+       unsigned int cb_proc;
+#else
+       unsigned long cb_rpcvers;       /* must be equal to two */
+       unsigned long cb_prog;
+       unsigned long cb_vers;
+       unsigned long cb_proc;
+#endif
        struct opaque_auth cb_cred;
        struct opaque_auth cb_verf; /* protocol specific - provided by client */
 };
@@ -170,7 +190,11 @@ struct call_body {
  * The rpc message
  */
 struct rpc_msg {
-       u_long                  rm_xid;
+#ifdef __LP64__
+       unsigned int                    rm_xid;
+#else
+       unsigned long                   rm_xid;
+#endif
        enum msg_type           rm_direction;
        union {
                struct call_body RM_cmb;