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

login
register
mail settings
Submitter phabricator
Date Jan. 17, 2020, 12:21 p.m.
Message ID <93330da6e4d355fc6266cde9358e023f@localhost.localdomain>
Download mbox | patch
Permalink /patch/44476/
State Not Applicable
Headers show

Comments

phabricator - Jan. 17, 2020, 12:21 p.m.
Closed by commit rHGb4420cea45e8: sha1dc: avoid including the nonexistent stdint.h with Visual Studio 2008 (authored by mharbison72).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7903?vs=19389&id=19405

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

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: 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 __int32 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