Skip to content

Fix types.h for MSVC6.0#8678

Merged
douzzer merged 1 commit intowolfSSL:masterfrom
embhorn:zd19742
Apr 17, 2025
Merged

Fix types.h for MSVC6.0#8678
douzzer merged 1 commit intowolfSSL:masterfrom
embhorn:zd19742

Conversation

@embhorn
Copy link
Copy Markdown
Member

@embhorn embhorn commented Apr 16, 2025

Description

MSVC6 does not have the "long long" data type. However, MSVC6 does have built-in support for __int64 and unsigned __int64. Windows.h is not necessary for this.

Fixes zd19742

Testing

Customer conifirmed

Checklist

  • added tests
  • updated/added doxygen
  • updated appropriate READMEs
  • Updated manual and documentation

@embhorn embhorn self-assigned this Apr 16, 2025
@embhorn embhorn requested a review from Copilot April 16, 2025 14:27
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR updates wolfssl/wolfcrypt/types.h to support MSVC6.0 by replacing the "long long" data type with MSVC6.0’s native __int64 types.

  • Added an explicit condition for MSVC6.0 using (_MSC_VER == 1200).
  • Retained existing checks for other MSVC versions and compilers.
Comments suppressed due to low confidence (1)

wolfssl/wolfcrypt/types.h:255

  • [nitpick] Consider enhancing the inline comment to clarify why MSVC6.0 is treated separately, ensuring the rationale is immediately clear to maintainers.
#if (defined(_MSC_VER) && (_MSC_VER == 1200)) ||  /* MSVC6 */ \

@embhorn
Copy link
Copy Markdown
Member Author

embhorn commented Apr 16, 2025

Retest this please

https://cloud.wolfssl-test.com/jenkins/job/PRB-generic-config-parser/8120/
Also:   org.jenkinsci.plugins.workflow.actions.ErrorAction$ErrorId: 02e1fc80-1e96-4810-ac9e-b0f00b974314
org.jenkinsci.plugins.workflow.support.steps.AgentOfflineException: Unable to create live FilePath for wolf-linux-cloud-node-n6ec9n; wolf-linux-cloud-node-n6ec9n was marked offline: Connection was broken

@embhorn embhorn requested a review from dgarske April 16, 2025 17:13
Comment thread wolfssl/wolfcrypt/types.h
@embhorn embhorn assigned wolfSSL-Bot and unassigned embhorn Apr 17, 2025
@embhorn embhorn added the For This Release Release version 5.9.1 label Apr 17, 2025
@douzzer douzzer merged commit b533d08 into wolfSSL:master Apr 17, 2025
186 checks passed
@embhorn embhorn deleted the zd19742 branch April 24, 2026 21:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

For This Release Release version 5.9.1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants