Merge commit '3b62a3369a41' from llvm.org/main into next

Author: git apple-llvm automerger

libc/include/llvm-libc-types/ENTRY.h

@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_ENTRY_H
 #define LLVM_LIBC_TYPES_ENTRY_H
 
-typedef struct {
+typedef struct entry {
   char *key;
   void *data;
 } ENTRY;