This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7903

sha1dc: avoid including the nonexistent stdint.h with Visual Studio 2008
ClosedPublic

Authored by mharbison72 on Jan 15 2020, 11:34 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb4420cea45e8: sha1dc: avoid including the nonexistent stdint.h with Visual Studio 2008

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Jan 15 2020, 11:34 PM
mharbison72 added inline comments.Jan 16 2020, 9:33 AM
mercurial/thirdparty/sha1dc/lib/ubc_check.h
35

I see that ef36156eac9f uses typedef unsigned __int32 uint32_t if somebody wants to fix in flight.

yuja added a subscriber: yuja.Jan 16 2020, 10:08 AM

#ifndef SHA1DC_NO_STANDARD_INCLUDES
+#if !defined(_MSC_VER) || _MSC_VER >= 1600
#include <stdint.h>
+#else
+/* prior to Visual Studio 2010 */
+typedef unsigned int uint32_t;

unsigned __int32 for consistency.

mharbison72 added a commit: rHGb4420cea45e8: sha1dc: avoid including the nonexistent stdint.h with Visual Studio 2008.Jan 17 2020, 7:21 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGb4420cea45e8: sha1dc: avoid including the nonexistent stdint.h with Visual Studio 2008 (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 19405

mercurial/thirdparty/sha1dc/lib/ubc_check.h

#ifndef SHA1DC_UBC_CHECK_H #ifndef SHA1DC_UBC_CHECK_H
#define SHA1DC_UBC_CHECK_H #define SHA1DC_UBC_CHECK_H
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#endif #endif
#ifndef SHA1DC_NO_STANDARD_INCLUDES #ifndef SHA1DC_NO_STANDARD_INCLUDES
#if !defined(_MSC_VER) || _MSC_VER >= 1600
#include <stdint.h> #include <stdint.h>
#else
/* prior to Visual Studio 2010 */
typedef unsigned __int32 uint32_t;
mharbison72AuthorUnsubmitted
Done

I see that ef36156eac9f uses typedef unsigned __int32 uint32_t if somebody wants to fix in flight.

mharbison72: I see that ef36156eac9f uses `typedef unsigned __int32 uint32_t` if somebody wants to fix in…
#endif
#endif #endif
#define DVMASKSIZE 1 #define DVMASKSIZE 1
typedef struct { int dvType; int dvK; int dvB; int testt; int maski; int maskb; uint32_t dm[80]; } dv_info_t; typedef struct { int dvType; int dvK; int dvB; int testt; int maski; int maskb; uint32_t dm[80]; } dv_info_t;
extern dv_info_t sha1_dvs[]; extern dv_info_t sha1_dvs[];
void ubc_check(const uint32_t W[80], uint32_t dvmask[DVMASKSIZE]); void ubc_check(const uint32_t W[80], uint32_t dvmask[DVMASKSIZE]);
#define DOSTORESTATE58 #define DOSTORESTATE58

mercurial/thirdparty/sha1dc/lib/ubc_check.c

// thus one needs to do the recompression check for each DV that has its bit set // thus one needs to do the recompression check for each DV that has its bit set
// //
// ubc_check is programmatically generated and the unavoidable bitconditions have been hardcoded // ubc_check is programmatically generated and the unavoidable bitconditions have been hardcoded
// a directly verifiable version named ubc_check_verify can be found in ubc_check_verify.c // a directly verifiable version named ubc_check_verify can be found in ubc_check_verify.c
// ubc_check has been verified against ubc_check_verify using the 'ubc_check_test' program in the tools section // ubc_check has been verified against ubc_check_verify using the 'ubc_check_test' program in the tools section
*/ */
#ifndef SHA1DC_NO_STANDARD_INCLUDES #ifndef SHA1DC_NO_STANDARD_INCLUDES
#if !defined(_MSC_VER) || _MSC_VER >= 1600
#include <stdint.h> #include <stdint.h>
#endif #endif
#endif
#ifdef SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C #ifdef SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C
#include SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C #include SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C
#endif #endif
#include "ubc_check.h" #include "ubc_check.h"
static const uint32_t DV_I_43_0_bit = (uint32_t)(1) << 0; static const uint32_t DV_I_43_0_bit = (uint32_t)(1) << 0;
static const uint32_t DV_I_44_0_bit = (uint32_t)(1) << 1; static const uint32_t DV_I_44_0_bit = (uint32_t)(1) << 1;
static const uint32_t DV_I_45_0_bit = (uint32_t)(1) << 2; static const uint32_t DV_I_45_0_bit = (uint32_t)(1) << 2;