PERFORCE change 134373 for review

[Robert Watson]

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

Change 134373 by rwatson at rwatson_cinnamon on 2008/01/29 12:22:54

	Use ipc_perm._key and ipc_perm._seq when configured.
	
	Submitted by:	Eric Hall <trustedbsd at darkart dot com>

Affected files ...

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

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#64 (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#63 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#64 $
  */
 
 #include <sys/types.h>
@@ -506,15 +506,23 @@
 
 #ifdef HAVE_IPC_PERM___SEQ
 	ADD_U_INT16(dptr, perm->__seq);
-#else
+#else	/* HAVE_IPC_PERM___SEQ */
+#ifdef  HAVE_IPC_PERM__SEQ
+	ADD_U_INT16(dptr, perm->_seq);
+#else	/* HAVE_IPC_PERM__SEQ */
 	ADD_U_INT16(dptr, perm->seq);
-#endif
+#endif	/* HAVE_IPC_PERM__SEQ */
+#endif	/* HAVE_IPC_PERM___SEQ */
 
 #ifdef HAVE_IPC_PERM___KEY
 	ADD_U_INT32(dptr, perm->__key);
-#else
+#else	/* HAVE_IPC_PERM___KEY */
+#ifdef  HAVE_IPC_PERM__KEY
+	ADD_U_INT32(dptr, perm->_key);
+#else	/* HAVE_IPC_PERM__KEY */
 	ADD_U_INT32(dptr, perm->key);
-#endif
+#endif	/* HAVE_IPC_PERM__KEY */
+#endif	/* HAVE_IPC_PERM___KEY */
 
 	return (t);
 }