Juan Lang : wincrypt.h: Remove duplicate definitions.
Alexandre Julliard
julliard at winehq.org
Mon Jun 21 11:07:00 CDT 2010
Module: wine
Branch: master
Commit: 3d73c466ca5a3a799f003387f889507b8d1afa76
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d73c466ca5a3a799f003387f889507b8d1afa76
Author: Juan Lang <juan.lang at gmail.com>
Date: Fri Jun 18 12:20:01 2010 -0700
wincrypt.h: Remove duplicate definitions.
---
include/wincrypt.h | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/include/wincrypt.h b/include/wincrypt.h
index d3f56b9..39c098a 100644
--- a/include/wincrypt.h
+++ b/include/wincrypt.h
@@ -3007,7 +3007,12 @@ typedef struct _CTL_FIND_SUBJECT_PARA
#define szOID_AUTO_ENROLL_CTL_USAGE "1.3.6.1.4.1.311.20.1"
#define szOID_ENROLL_CERTTYPE_EXTENSION "1.3.6.1.4.1.311.20.2"
#define szOID_ENROLLMENT_AGENT "1.3.6.1.4.1.311.20.2.1"
+#ifndef szOID_KP_SMARTCARD_LOGON
#define szOID_KP_SMARTCARD_LOGON "1.3.6.1.4.1.311.20.2.2"
+#endif
+#ifndef szOID_NT_PRINCIPAL_NAME
+#define szOID_NT_PRINCIPAL_NAME "1.3.6.1.4.1.311.20.2.3"
+#endif
#define szOID_CERT_MANIFOLD "1.3.6.1.4.1.311.20.3"
#ifndef szOID_CERTSRV_CA_VERSION
#define szOID_CERTSRV_CA_VERSION "1.3.6.1.4.1.311.21.1"
@@ -3079,21 +3084,6 @@ typedef struct _CTL_FIND_SUBJECT_PARA
#define szOID_SERIALIZED "1.3.6.1.4.1.311.10.3.3.1"
#endif
-#define szOID_AUTO_ENROLL_CTL_USAGE "1.3.6.1.4.1.311.20.1"
-#define szOID_ENROLL_CERTTYPE_EXTENSION "1.3.6.1.4.1.311.20.2"
-#define szOID_ENROLLMENT_AGENT "1.3.6.1.4.1.311.20.2.1"
-#ifndef szOID_KP_SMARTCARD_LOGON
-#define szOID_KP_SMARTCARD_LOGON "1.3.6.1.4.1.311.20.2.2"
-#endif
-#ifndef szOID_NT_PRINCIPAL_NAME
-#define szOID_NT_PRINCIPAL_NAME "1.3.6.1.4.1.311.20.2.3"
-#endif
-#define szOID_CERT_MANIFOLD "1.3.6.1.4.1.311.20.3"
-
-#ifndef szOID_CERTSRV_CA_VERSION
-#define szOID_CERTSRV_CA_VERSION "1.3.6.1.4.1.311.21.1"
-#endif
-
#ifndef szOID_PRODUCT_UPDATE
#define szOID_PRODUCT_UPDATE "1.3.6.1.4.1.311.31.1"
#endif
More information about the wine-cvs
mailing list