-
Notifications
You must be signed in to change notification settings - Fork 6.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[metis] Fix redefinition with msvc header file (#13778)
Co-authored-by: Billy Robert O'Neal III <[email protected]>
- Loading branch information
1 parent
50fb30f
commit a8ac019
Showing
3 changed files
with
38 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
Source: metis | ||
Version: 5.1.0-6 | ||
Version: 5.1.0 | ||
Port-Version: 7 | ||
Homepage: https://glaros.dtc.umn.edu/gkhome/metis/metis/overview | ||
Description: Serial Graph Partitioning and Fill-reducing Matrix Ordering |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
diff --git a/include/metis.h b/include/metis.h | ||
index dc5406a..7732437 100644 | ||
--- a/include/metis.h | ||
+++ b/include/metis.h | ||
@@ -72,10 +72,14 @@ typedef __int64 int64_t; | ||
#define PRId64 "I64d" | ||
#define SCNd32 "ld" | ||
#define SCNd64 "I64d" | ||
+#ifdef _WIN32 | ||
+#include <stdint.h> | ||
+#else | ||
#define INT32_MIN ((int32_t)_I32_MIN) | ||
#define INT32_MAX _I32_MAX | ||
#define INT64_MIN ((int64_t)_I64_MIN) | ||
#define INT64_MAX _I64_MAX | ||
+#endif | ||
#else | ||
#include <inttypes.h> | ||
#endif | ||
diff --git a/GKlib/gk_arch.h b/GKlib/gk_arch.h | ||
index 78b1431..7258763 100644 | ||
--- a/GKlib/gk_arch.h | ||
+++ b/GKlib/gk_arch.h | ||
@@ -32,8 +32,8 @@ | ||
|
||
|
||
#ifdef __MSC__ | ||
- #include "ms_stdint.h" | ||
- #include "ms_inttypes.h" | ||
+ #include <stdint.h> | ||
+ #include <inttypes.h> | ||
#include "ms_stat.h" | ||
#else | ||
#ifndef SUNOS |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters