PERFORCE change 92510 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=92510

Change 92510 by rwatson at rwatson_lethe.cl.cam.ac.uk on 2006/02/28 01:58:50

	Use __key and __seq if required (Linux).

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#40 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#40 (text+ko) ====

@@ -30,7 +30,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#39 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#40 $
  */
 
 #include <sys/types.h>
@@ -467,9 +467,18 @@
 	ADD_U_INT16(dptr, perm->mode);
 
 	ADD_U_INT16(dptr, pad0);
+
+#ifdef HAVE_IPC_PERM___SEQ
+	ADD_U_INT16(dptr, perm->__seq);
+#else
 	ADD_U_INT16(dptr, perm->seq);
+#endif
 
+#ifdef HAVE_IPC_PERM___KEY
+	ADD_U_INT32(dptr, perm->__key);
+#else
 	ADD_U_INT32(dptr, perm->key);
+#endif
 
 	return (t);
 }