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

login
register
mail settings
Submitter phabricator
Date Jan. 16, 2020, 4:35 a.m.
Message ID <differential-rev-PHID-DREV-bewhe4n2cdm4jxpfxnf5-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/44411/
State Superseded
Headers show

Comments

phabricator - Jan. 16, 2020, 4:35 a.m.
mharbison72 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D7903

AFFECTED FILES
  mercurial/thirdparty/sha1dc/lib/ubc_check.c
  mercurial/thirdparty/sha1dc/lib/ubc_check.h

CHANGE DETAILS




To: mharbison72, #hg-reviewers
Cc: mercurial-devel
phabricator - Jan. 16, 2020, 2:34 p.m.
mharbison72 added inline comments.

INLINE COMMENTS

> ubc_check.h:35
> +/* prior to Visual Studio 2010 */
> +typedef unsigned int uint32_t;
> +#endif

I see that ef36156eac9f <https://phab.mercurial-scm.org/rHGef36156eac9f657fe7068f4bd1f84c4f5a81ded5> uses `typedef unsigned __int32 uint32_t` if somebody wants to fix in flight.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7903/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7903

To: mharbison72, #hg-reviewers
Cc: mercurial-devel
Yuya Nishihara - Jan. 16, 2020, 2:36 p.m.
>  #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.
phabricator - Jan. 16, 2020, 3:08 p.m.
yuja added a comment.


  > #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.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7903/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7903

To: mharbison72, #hg-reviewers
Cc: yuja, mercurial-devel

Patch

diff --git a/mercurial/thirdparty/sha1dc/lib/ubc_check.h b/mercurial/thirdparty/sha1dc/lib/ubc_check.h
--- a/mercurial/thirdparty/sha1dc/lib/ubc_check.h
+++ b/mercurial/thirdparty/sha1dc/lib/ubc_check.h
@@ -28,7 +28,12 @@ 
 #endif
 
 #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;
+#endif
 #endif
 
 #define DVMASKSIZE 1
diff --git a/mercurial/thirdparty/sha1dc/lib/ubc_check.c b/mercurial/thirdparty/sha1dc/lib/ubc_check.c
--- a/mercurial/thirdparty/sha1dc/lib/ubc_check.c
+++ b/mercurial/thirdparty/sha1dc/lib/ubc_check.c
@@ -25,8 +25,10 @@ 
 */
 
 #ifndef SHA1DC_NO_STANDARD_INCLUDES
+#if !defined(_MSC_VER) || _MSC_VER >= 1600
 #include <stdint.h>
 #endif
+#endif
 #ifdef SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C
 #include SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C
 #endif