1120664 - pkix/Result.h has a duplicate token by a macro defined in windows.h

Status: RESOLVED FIXED

(Core :: Security: PSM, defect)

Description

[Masatoshi Kimura [:emk]]

Attachment: windows_h_test

Steps to reproduce:
1. Apply the attached patch.
2. Build the tree on Windows.

Actual result:
The following criptic message.

 1:52.69 Unified_cpp_manager_ssl_src1.cpp
 1:52.69 f:\m\mozilla-central\security\pkix\include\pkix/Result.h(187) : error C
2059: 構文エラー : '定数'
 1:52.69 f:\m\mozilla-central\security\pkix\include\pkix/Result.h(187) : error C
3805: '定数': 予期しないトークン。'}' か ',' が必要です。
 1:52.70 f:\m\mozilla-central\security\pkix\include\pkix/Input.h(89) : error C28
38: 'FATAL_ERROR_INVALID_ARGS' : メンバー宣言内の限定名が間違っています。
 1:52.70 f:\m\mozilla-central\security\pkix\include\pkix/Input.h(89) : error C20
65: 'FATAL_ERROR_INVALID_ARGS' : 定義されていない識別子です。
 1:52.70 f:\m\mozilla-central\security\pkix\include\pkix/Input.h(163) : error C2
838: 'FATAL_ERROR_INVALID_ARGS' : メンバー宣言内の限定名が間違っています。
 1:52.70 f:\m\mozilla-central\security\pkix\include\pkix/Input.h(163) : error C2
065: 'FATAL_ERROR_INVALID_ARGS' : 定義されていない識別子です。
 1:52.70 f:\m\mozilla-central\security\pkix\include\pkix/Input.h(302) : error C2
838: 'FATAL_ERROR_INVALID_ARGS' : メンバー宣言内の限定名が間違っています。
 1:52.70 f:\m\mozilla-central\security\pkix\include\pkix/Input.h(302) : error C2
065: 'FATAL_ERROR_INVALID_ARGS' : 定義されていない識別子です。
 1:52.70 f:\m\mozilla-central\security\pkix\include\pkix/Input.h(313) : error C2
838: 'FATAL_ERROR_INVALID_ARGS' : メンバー宣言内の限定名が間違っています。
 1:52.71 f:\m\mozilla-central\security\pkix\include\pkix/Input.h(313) : error C2
065: 'FATAL_ERROR_INVALID_ARGS' : 定義されていない識別子です。
 1:52.71 f:\m\mozilla-central\security\pkix\include\pkix/Time.h(79) : error C283
8: 'FATAL_ERROR_INVALID_ARGS' : メンバー宣言内の限定名が間違っています。
 1:52.71 f:\m\mozilla-central\security\pkix\include\pkix/Time.h(79) : error C206
5: 'FATAL_ERROR_INVALID_ARGS' : 定義されていない識別子です。
 1:52.71 f:\m\mozilla-central\security\pkix\include\pkix/Time.h(88) : error C283
8: 'FATAL_ERROR_INVALID_ARGS' : メンバー宣言内の限定名が間違っています。
 1:52.71 f:\m\mozilla-central\security\pkix\include\pkix/Time.h(88) : error C206
5: 'FATAL_ERROR_INVALID_ARGS' : 定義されていない識別子です。

Expected result:
The tree should build.

By adding A.cpp onto security/manager/ssl/src, nsKeygenHandlerContent.cpp will move from Unified_cpp_manager_ssl_src0.cpp to Unified_cpp_manager_ssl_src1.cpp. nsKeygenHandlerContent.cpp will end up with including windows.h. windows.h will #define ERROR_INVALID_KEY macro, which will prevent to compile pkix/Result.h.

Comment 1

[Masatoshi Kimura [:emk]]

Attachment: windows_h_must_die

Undefine ERROR_INVALID_KEY before using MOZILLA_PKIX_MAP_LIST.

Comment 2

[Dana Keeler (she/her) (use needinfo) [:keeler]]

Comment on attachment 8547793 [details] [diff] [review]
windows_h_must_die

I think Brian would be a better reviewer of this. In particular, I imagine we don't want to unconditionally undefine ERROR_INVALID_TIME, but I don't know what a sound approach would be.

Comment 3

[Brian Smith (:briansmith, :bsmith, use NEEDINFO?)]

Comment on attachment 8547793 [details] [diff] [review]
windows_h_must_die

Review of attachment 8547793 [details] [diff] [review]:
-----------------------------------------------------------------

How about we just rename mozilla::pkix's ERROR_INVALID_TIME to ERROR_INVALID_TIME_DER or ERROR_INVALID_DER_TIME? Then we can avoid the mess. I think that would be better.

Comment 4

[Masatoshi Kimura [:emk]]

Attachment: Rename mozilla::pkix::Result::ERROR_INVALID_TIME to avoid collision with a macro defined in windows.h

OK. Renamed to ERROR_INVALID_DER_TIME.

Comment 5

[Masatoshi Kimura [:emk]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/38fdf8e1c502

Comment 6

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/38fdf8e1c502