From 5d54f3d8999eac1762fe0a8c7177d20f1f201fae Mon Sep 17 00:00:00 2001 From: muffin Date: Thu, 20 Oct 2005 11:47:44 -0700 Subject: 6309237 gcc and libbc don't get along --- usr/src/lib/libbc/inc/include/sys/des.h | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'usr/src/lib/libbc/inc/include/sys/des.h') diff --git a/usr/src/lib/libbc/inc/include/sys/des.h b/usr/src/lib/libbc/inc/include/sys/des.h index 57e4bfa54f..795e3b0544 100644 --- a/usr/src/lib/libbc/inc/include/sys/des.h +++ b/usr/src/lib/libbc/inc/include/sys/des.h @@ -19,17 +19,21 @@ * * CDDL HEADER END */ +/* + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + +#ifndef _sys_des_h +#define _sys_des_h + #pragma ident "%Z%%M% %I% %E% SMI" /* * Generic DES driver interface * Keep this file hardware independent! - * Copyright (c) 1986 by Sun Microsystems, Inc. */ -#ifndef _sys_des_h -#define _sys_des_h - #define DES_MAXLEN 65536 /* maximum # of bytes to encrypt */ #define DES_QUICKLEN 16 /* maximum # of bytes to encrypt quickly */ @@ -49,18 +53,18 @@ struct desparams { u_char UDES_data[DES_QUICKLEN]; u_char *UDES_buf; } UDES; -# define des_data UDES.UDES_data /* direct data here if quick */ -# define des_buf UDES.UDES_buf /* otherwise, pointer to data */ +#define des_data UDES.UDES_data /* direct data here if quick */ +#define des_buf UDES.UDES_buf /* otherwise, pointer to data */ }; /* * Encrypt an arbitrary sized buffer */ -#define DESIOCBLOCK _IOWR(d, 6, struct desparams) +#define DESIOCBLOCK _IOWR('d', 6, struct desparams) /* * Encrypt of small amount of data, quickly */ -#define DESIOCQUICK _IOWR(d, 7, struct desparams) +#define DESIOCQUICK _IOWR('d', 7, struct desparams) -#endif /*!_sys_des_h*/ +#endif /* !_sys_des_h */ -- cgit v1.2.3