More gcc 2.95 adjustments

[Jeremy White]

Allow crypt32/dlls/tests/oid.c to compile with gcc 2.95
-------------- next part --------------
Subject: [PATCH] Support gcc 2.95

---

 dlls/crypt32/tests/oid.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

a2e13e11532b6a55672c0466abcc9a870a961a4e
diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c
index cfda412..1ae93c0 100644
--- a/dlls/crypt32/tests/oid.c
+++ b/dlls/crypt32/tests/oid.c
@@ -19,6 +19,7 @@
  */
 #include <stdio.h>
 #include <stdarg.h>
+#define NONAMELESSUNION
 #include <windef.h>
 #include <winbase.h>
 #include <winerror.h>
@@ -356,8 +357,8 @@ static void test_findOIDInfo(void)
     {
         ok(!strcmp(info->pszOID, szOID_RSA_MD5), "Expected %s, got %s\n",
          szOID_RSA_MD5, info->pszOID);
-        ok(info->Algid == CALG_MD5, "Expected CALG_MD5, got %d\n",
-         info->Algid);
+        ok(info->u.Algid == CALG_MD5, "Expected CALG_MD5, got %d\n",
+         info->u.Algid);
     }
     info = CryptFindOIDInfo(CRYPT_OID_INFO_NAME_KEY, (void *)sha1, 0);
     ok(info != NULL, "Expected to find sha1\n");
@@ -365,8 +366,8 @@ static void test_findOIDInfo(void)
     {
         ok(!strcmp(info->pszOID, szOID_OIWSEC_sha1), "Expected %s, got %s\n",
          szOID_OIWSEC_sha1, info->pszOID);
-        ok(info->Algid == CALG_SHA1, "Expected CALG_SHA1, got %d\n",
-         info->Algid);
+        ok(info->u.Algid == CALG_SHA1, "Expected CALG_SHA1, got %d\n",
+         info->u.Algid);
     }
     info = CryptFindOIDInfo(CRYPT_OID_INFO_ALGID_KEY, &alg, 0);
     ok(info != NULL, "Expected to find sha1\n");
@@ -374,8 +375,8 @@ static void test_findOIDInfo(void)
     {
         ok(!strcmp(info->pszOID, szOID_OIWSEC_sha1), "Expected %s, got %s\n",
          szOID_OIWSEC_sha1, info->pszOID);
-        ok(info->Algid == CALG_SHA1, "Expected CALG_SHA1, got %d\n",
-         info->Algid);
+        ok(info->u.Algid == CALG_SHA1, "Expected CALG_SHA1, got %d\n",
+         info->u.Algid);
     }
     info = CryptFindOIDInfo(CRYPT_OID_INFO_SIGN_KEY, algs, 0);
     ok(info != NULL, "Expected to find md5RSA\n");
@@ -383,8 +384,8 @@ static void test_findOIDInfo(void)
     {
         ok(!strcmp(info->pszOID, szOID_RSA_MD5RSA), "Expected %s, got %s\n",
          szOID_RSA_MD5RSA, info->pszOID);
-        ok(info->Algid == CALG_MD5, "Expected CALG_MD5, got %d\n",
-         info->Algid);
+        ok(info->u.Algid == CALG_MD5, "Expected CALG_MD5, got %d\n",
+         info->u.Algid);
     }
 }
 
-- 
1.1.5