fix broken tbox builds for solaris for now

This commit is contained in:
ian.mcgreer%sun.com 2001-10-11 17:05:08 +00:00
Родитель dbd677e510
Коммит 9f7191ae3b
2 изменённых файлов: 12 добавлений и 12 удалений

Просмотреть файл

@ -32,7 +32,7 @@
*/ */
#ifdef DEBUG #ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: ckhelper.c,v $ $Revision: 1.5 $ $Date: 2001/10/11 16:33:36 $ $Name: $"; static const char CVS_ID[] = "@(#) $RCSfile: ckhelper.c,v $ $Revision: 1.6 $ $Date: 2001/10/11 17:05:08 $ $Name: $";
#endif /* DEBUG */ #endif /* DEBUG */
#ifndef PKIT_H #ifndef PKIT_H
@ -60,23 +60,23 @@ static const char CVS_ID[] = "@(#) $RCSfile: ckhelper.c,v $ $Revision: 1.5 $ $Da
#endif /* BASE_H */ #endif /* BASE_H */
static const CK_BBOOL s_true = CK_TRUE; static const CK_BBOOL s_true = CK_TRUE;
NSS_IMPLEMENT_DATA const NSSItem NSS_IMPLEMENT_DATA /* const */ NSSItem
g_ck_true = { (CK_VOID_PTR)&s_true, sizeof(s_true) }; g_ck_true = { (CK_VOID_PTR)&s_true, sizeof(s_true) };
static const CK_BBOOL s_false = CK_FALSE; static const CK_BBOOL s_false = CK_FALSE;
NSS_IMPLEMENT_DATA const NSSItem NSS_IMPLEMENT_DATA /* const */ NSSItem
g_ck_false = { (CK_VOID_PTR)&s_false, sizeof(s_false) }; g_ck_false = { (CK_VOID_PTR)&s_false, sizeof(s_false) };
static const CK_OBJECT_CLASS s_class_cert = CKO_CERTIFICATE; static const CK_OBJECT_CLASS s_class_cert = CKO_CERTIFICATE;
NSS_IMPLEMENT_DATA const NSSItem NSS_IMPLEMENT_DATA /* const */ NSSItem
g_ck_class_cert = { (CK_VOID_PTR)&s_class_cert, sizeof(s_class_cert) }; g_ck_class_cert = { (CK_VOID_PTR)&s_class_cert, sizeof(s_class_cert) };
static const CK_OBJECT_CLASS s_class_pubkey = CKO_PUBLIC_KEY; static const CK_OBJECT_CLASS s_class_pubkey = CKO_PUBLIC_KEY;
NSS_IMPLEMENT_DATA const NSSItem NSS_IMPLEMENT_DATA /* const */ NSSItem
g_ck_class_pubkey = { (CK_VOID_PTR)&s_class_pubkey, sizeof(s_class_pubkey) }; g_ck_class_pubkey = { (CK_VOID_PTR)&s_class_pubkey, sizeof(s_class_pubkey) };
static const CK_OBJECT_CLASS s_class_privkey = CKO_PRIVATE_KEY; static const CK_OBJECT_CLASS s_class_privkey = CKO_PRIVATE_KEY;
NSS_IMPLEMENT_DATA const NSSItem NSS_IMPLEMENT_DATA /* const */ NSSItem
g_ck_class_privkey = { (CK_VOID_PTR)&s_class_privkey, sizeof(s_class_privkey) }; g_ck_class_privkey = { (CK_VOID_PTR)&s_class_privkey, sizeof(s_class_privkey) };
NSS_IMPLEMENT PRStatus NSS_IMPLEMENT PRStatus

Просмотреть файл

@ -41,7 +41,7 @@
#define CKHELPER_H #define CKHELPER_H
#ifdef DEBUG #ifdef DEBUG
static const char CKHELPER_CVS_ID[] = "@(#) $RCSfile: ckhelper.h,v $ $Revision: 1.5 $ $Date: 2001/10/11 16:33:36 $ $Name: $"; static const char CKHELPER_CVS_ID[] = "@(#) $RCSfile: ckhelper.h,v $ $Revision: 1.6 $ $Date: 2001/10/11 17:05:08 $ $Name: $";
#endif /* DEBUG */ #endif /* DEBUG */
#ifdef NSS_3_4_CODE #ifdef NSS_3_4_CODE
@ -63,13 +63,13 @@ PR_BEGIN_EXTERN_C
*/ */
/* Boolean values */ /* Boolean values */
NSS_EXTERN_DATA const NSSItem g_ck_true; NSS_EXTERN_DATA /* const */ NSSItem g_ck_true;
NSS_EXTERN_DATA const NSSItem g_ck_false; NSS_EXTERN_DATA /* const */ NSSItem g_ck_false;
/* Object classes */ /* Object classes */
NSS_EXTERN_DATA const NSSItem g_ck_class_cert; NSS_EXTERN_DATA /* const */ NSSItem g_ck_class_cert;
NSS_EXTERN_DATA const NSSItem g_ck_class_pubkey; NSS_EXTERN_DATA /* const */ NSSItem g_ck_class_pubkey;
NSS_EXTERN_DATA const NSSItem g_ck_class_privkey; NSS_EXTERN_DATA /* const */ NSSItem g_ck_class_privkey;
/* NSS_CK_ATTRIBUTE_TO_ITEM(attrib, item) /* NSS_CK_ATTRIBUTE_TO_ITEM(attrib, item)
* *