diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2022-10-12 14:33:56 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2022-10-12 14:36:44 +0300 |
| commit | 322917aeb8e672c21378fd371a5cff4a9f0c2520 (patch) | |
| tree | 70229faa39f14caa09b769153453c3898f64f7fc /gnu/packages/patches/scotch-integer-declarations.patch | |
| parent | 407f017663c97ebfe48e3cb304bf97bf2557f83f (diff) | |
| parent | e1baf802ccd8af4f7b416b0987db706f2dbfc42f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts:
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/kde-frameworks.scm
gnu/packages/video.scm
Diffstat (limited to 'gnu/packages/patches/scotch-integer-declarations.patch')
| -rw-r--r-- | gnu/packages/patches/scotch-integer-declarations.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/gnu/packages/patches/scotch-integer-declarations.patch b/gnu/packages/patches/scotch-integer-declarations.patch deleted file mode 100644 index 978625c1c0..0000000000 --- a/gnu/packages/patches/scotch-integer-declarations.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/src/libscotch/library.h b/src/libscotch/library.h -index 1891c19..ecc0533 100644 ---- a/src/libscotch/library.h -+++ b/src/libscotch/library.h -@@ -67,6 +67,8 @@ - - /*+ Integer type. +*/ - -+#include <stdint.h> -+ - typedef DUMMYIDX SCOTCH_Idx; - - typedef DUMMYINT SCOTCH_Num; -diff --git a/src/libscotchmetis/library_metis.h b/src/libscotchmetis/library_metis.h -index e6767e1..04e71c3 100644 ---- a/src/libscotchmetis/library_metis.h -+++ b/src/libscotchmetis/library_metis.h -@@ -99,6 +99,7 @@ typedef enum { - */ - - #ifndef SCOTCH_H /* In case "scotch.h" not included before */ -+#include <stdint.h> - typedef DUMMYINT SCOTCH_Num; - #endif /* SCOTCH_H */ - -diff --git a/src/libscotchmetis/library_parmetis.h b/src/libscotchmetis/library_parmetis.h -index 6d2f0b0..3c803fc 100644 ---- a/src/libscotchmetis/library_parmetis.h -+++ b/src/libscotchmetis/library_parmetis.h -@@ -106,6 +106,7 @@ typedef enum { - */ - - #ifndef SCOTCH_H /* In case "scotch.h" not included before */ -+#include <stdint.h> - typedef DUMMYINT SCOTCH_Num; - #endif /* SCOTCH_H */ - |