Ghidra is a software reverse engineering (SRE) framework
Merge remote-tracking branch 'origin/patch'
Ryan Kurtze7f495010e7b
diff --cc Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeUtilities.javaindex 86a47cf0d8,167a421f9d..5d76895dc6--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeUtilities.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeUtilities.java@@@ -730,7 -734,7 +734,7 @@@ public class DataTypeUtilities* Compare datatype category path lengths for sorting shortest path first.* Tie-breaker based on path name sort.* Rationale is to provide some deterministic datatype selection behavior and-- * to allow duplicates within a hierarchical orgainzation to prefer the short++ * to allow duplicates within a hierarchical organization to prefer the short* path to reduce bad namespace matches.*/private static final Comparator<DataType> DATATYPE_CATEGORY_PATH_LENGTH_COMPARATOR =