PERFORCE change 92736 for review

[Robert Watson]

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

Change 92736 by rwatson at rwatson_zoo on 2006/03/04 17:08:13

	Trim Linux ifdefs from kernel version of bsm_token code.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#10 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#10 (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/audit3/sys/security/audit/audit_bsm_token.c#9 $
+ * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#10 $
  */
 
 #include <sys/types.h>
@@ -410,17 +410,9 @@
 
 	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);
 }