Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix a warning from MSVC build #6995

Closed
wants to merge 1 commit into from
Closed

Fix a warning from MSVC build #6995

wants to merge 1 commit into from

Conversation

bernd-edlinger
Copy link
Member

This should fix a couple of warnings from windows builds:

cl  /I "." /I "crypto\include" /I "include" /I ".." /I "..\crypto\include" /I "..\include" -DDSO_WIN32 -DNDEBUG -DOPENSSL_THREADS -DOPENSSL_NO_DYNAMIC_ENGINE -DOPENSSL_PIC "-DENGINESDIR=\"C:\\Program Files (x86)\\OpenSSL\\lib\\engines-1_1\"" "-DOPENSSLDIR=\"C:\\Program Files (x86)\\Common Files\\SSL\"" -W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -DUNICODE -D_UNICODE  /O2 /Zi /Fdossl_static /MT /Zl -c /Focrypto\bio\b_print.obj "..\crypto\bio\b_print.c"
b_print.c
C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE\stdint.h(48): warning C4005: 'INT8_MIN': macro redefinition
C:\projects\openssl\include\internal/numbers.h(40): note: see previous definition of 'INT8_MIN'
C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE\stdint.h(49): warning C4005: 'INT16_MIN': macro redefinition
C:\projects\openssl\include\internal/numbers.h(46): note: see previous definition of 'INT16_MIN'
C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE\stdint.h(50): warning C4005: 'INT32_MIN': macro redefinition
C:\projects\openssl\include\internal/numbers.h(52): note: see previous definition of 'INT32_MIN'
C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE\stdint.h(51): warning C4005: 'INT64_MIN': macro redefinition
C:\projects\openssl\include\internal/numbers.h(58): note: see previous definition of 'INT64_MIN'
C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE\stdint.h(52): warning C4005: 'INT8_MAX': macro redefinition
C:\projects\openssl\include\internal/numbers.h(41): note: see previous definition of 'INT8_MAX'
C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE\stdint.h(53): warning C4005: 'INT16_MAX': macro redefinition
C:\projects\openssl\include\internal/numbers.h(47): note: see previous definition of 'INT16_MAX'
C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE\stdint.h(54): warning C4005: 'INT32_MAX': macro redefinition
C:\projects\openssl\include\internal/numbers.h(53): note: see previous definition of 'INT32_MAX'
C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE\stdint.h(55): warning C4005: 'INT64_MAX': macro redefinition
C:\projects\openssl\include\internal/numbers.h(59): note: see previous definition of 'INT64_MAX'
C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE\stdint.h(56): warning C4005: 'UINT8_MAX': macro redefinition
C:\projects\openssl\include\internal/numbers.h(42): note: see previous definition of 'UINT8_MAX'
C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE\stdint.h(57): warning C4005: 'UINT16_MAX': macro redefinition
C:\projects\openssl\include\internal/numbers.h(48): note: see previous definition of 'UINT16_MAX'
C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE\stdint.h(58): warning C4005: 'UINT32_MAX': macro redefinition
C:\projects\openssl\include\internal/numbers.h(54): note: see previous definition of 'UINT32_MAX'
C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE\stdint.h(59): warning C4005: 'UINT64_MAX': macro redefinition
C:\projects\openssl\include\internal/numbers.h(60): note: see previous definition of 'UINT64_MAX'

@bernd-edlinger
Fix a warning from MSVC build
b934c1d 
Apparently after internal/numbers.h defines INTx_MIN/MAX
stdint gets included and it defines those differently:

C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE\stdint.h(48):
 warning C4005: 'INT8_MIN': macro redefinition

Avoid that by changing the sequence in which the include files
appear in crypto/bio/b_print.c.

[extended tests]
levitte pushed a commit that referenced this pull request Aug 18, 2018
@bernd-edlinger
Fix a warning from MSVC build
b2a7315 
Apparently after internal/numbers.h defines INTx_MIN/MAX
stdint gets included and it defines those differently:

C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE\stdint.h(48):
 warning C4005: 'INT8_MIN': macro redefinition

Avoid that by changing the sequence in which the include files
appear in crypto/bio/b_print.c.

[extended tests]

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from #6995)
@bernd-edlinger
Copy link
Member Author

Merged to 1.1.0 as b2a7315. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@t-j-h t-j-h t-j-h approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@bernd-edlinger @t-j-h