Skip to content

Commit 158f8c3

Browse files
committed
Merge remote-tracking branch 'origin/master' into master-next
2 parents 732f1aa + 71f2671 commit 158f8c3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

stdlib/public/stubs/GlobalObjects.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ namespace llvm { namespace hashing { namespace detail {
142142
// hidden visibility, making this all internal to the dynamic library.
143143
// Systems that statically link the Swift runtime into applications (e.g. on
144144
// Linux) need this to handle the case when the app already uses LLVM.
145-
size_t LLVM_ATTRIBUTE_WEAK fixed_seed_override = 0;
145+
uint64_t LLVM_ATTRIBUTE_WEAK fixed_seed_override = 0;
146146
} // namespace detail
147147
} // namespace hashing
148148
} // namespace llvm

0 commit comments

Comments
 (0)