Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Utkarsh Ayachit
ParaView-Superbuild
Commits
0d1092ab
Commit
0d1092ab
authored
Feb 10, 2021
by
Ben Boeckel
⛰
Browse files
mili: add fixes for Xcode 12 support
parent
ee23e8a8
Changes
2
Hide whitespace changes
Inline
Side-by-side
projects/apple-unix/mili.cmake
View file @
0d1092ab
...
...
@@ -62,6 +62,7 @@ superbuild_project_add_step("custom-install"
if
(
UNIX
)
superbuild_apply_patch
(
mili unix-patch1
"Mili Unix patch 1"
)
superbuild_apply_patch
(
mili xcode-12
"Mili errors from Xcode 12"
)
if
(
APPLE
)
# Patches derived from VisIt build
# https://portal.nersc.gov/project/visit/releases/3.0.0/build_visit3_0_0
...
...
projects/apple-unix/patches/mili-xcode-12.patch
0 → 100644
View file @
0d1092ab
diff -u -Nru5 mili-15.1/src/mili_internal.h mili-15.1.xcode-12/src/mili_internal.h
--- mili-15.1/src/mili_internal.h 2016-07-21 14:20:22.000000000 -0400
+++ mili-15.1.xcode-12/src/mili_internal.h 2021-02-10 17:47:16.644292436 -0500
@@ -686,10 +686,11 @@
IO_mem_store *piioms );
void Mset_hash_dump_( int *compress );
/* srec.c - routines for managing state record descriptors. */
Return_value commit_srecs( Mili_family *fam );
+Return_value update_static_map( Famid fam_id, State_descriptor* p_sd );
void delete_srecs( Mili_family *fam );
void delete_subrec( void *ptr_subrec );
Return_value list_to_blocks( int size, int *list, int **dest, int *blk_cnt );
Return_value load_srec_formats( Mili_family *fam );
Return_value build_state_map( Mili_family *fam, Bool_type initial_build );
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment