6 files changed, 12 insertions, 12 deletions
diff --git a/lib/Archive/Archive.cpp b/lib/Archive/Archive.cpp
index f9fa80748b..d594a8715f 100644
--- a/lib/Archive/Archive.cpp
+++ b/lib/Archive/Archive.cpp
@@ -125,10 +125,10 @@ bool ArchiveMember::replaceWith(const sys::Path& newFile, std::string* ErrMsg) {
 
   // Determine what kind of file it is
   switch (sys::IdentifyFileType(signature,4)) {
-    case sys::BytecodeFileType:
+    case sys::Bytecode_FileType:
       flags |= BytecodeFlag;
       break;
-    case sys::CompressedBytecodeFileType:
+    case sys::CompressedBytecode_FileType:
       flags |= CompressedBytecodeFlag;
       flags &= ~CompressedFlag;
       break;
diff --git a/lib/Archive/ArchiveReader.cpp b/lib/Archive/ArchiveReader.cpp
index 67b6549e15..58b1e20ca6 100644
--- a/lib/Archive/ArchiveReader.cpp
+++ b/lib/Archive/ArchiveReader.cpp
@@ -205,10 +205,10 @@ Archive::parseMemberHeader(const char*& At, const char* End, std::string* error)
 
   // Determine if this is a bytecode file
   switch (sys::IdentifyFileType(At, 4)) {
-    case sys::BytecodeFileType:
+    case sys::Bytecode_FileType:
       flags |= ArchiveMember::BytecodeFlag;
       break;
-    case sys::CompressedBytecodeFileType:
+    case sys::CompressedBytecode_FileType:
       flags |= ArchiveMember::CompressedBytecodeFlag;
       flags &= ~ArchiveMember::CompressedFlag;
       break;
diff --git a/lib/Archive/ArchiveWriter.cpp b/lib/Archive/ArchiveWriter.cpp
index fc85374c02..b8e3280c12 100644
--- a/lib/Archive/ArchiveWriter.cpp
+++ b/lib/Archive/ArchiveWriter.cpp
@@ -178,10 +178,10 @@ Archive::addFileBefore(const sys::Path& filePath, iterator where,
   std::string magic;
   mbr->path.getMagicNumber(magic,4);
   switch (sys::IdentifyFileType(magic.c_str(),4)) {
-    case sys::BytecodeFileType:
+    case sys::Bytecode_FileType:
       flags |= ArchiveMember::BytecodeFlag;
       break;
-    case sys::CompressedBytecodeFileType:
+    case sys::CompressedBytecode_FileType:
       flags |= ArchiveMember::CompressedBytecodeFlag;
       break;
     default:
diff --git a/lib/Bytecode/Archive/Archive.cpp b/lib/Bytecode/Archive/Archive.cpp
index f9fa80748b..d594a8715f 100644
--- a/lib/Bytecode/Archive/Archive.cpp
+++ b/lib/Bytecode/Archive/Archive.cpp
@@ -125,10 +125,10 @@ bool ArchiveMember::replaceWith(const sys::Path& newFile, std::string* ErrMsg) {
 
   // Determine what kind of file it is
   switch (sys::IdentifyFileType(signature,4)) {
-    case sys::BytecodeFileType:
+    case sys::Bytecode_FileType:
       flags |= BytecodeFlag;
       break;
-    case sys::CompressedBytecodeFileType:
+    case sys::CompressedBytecode_FileType:
       flags |= CompressedBytecodeFlag;
       flags &= ~CompressedFlag;
       break;
diff --git a/lib/Bytecode/Archive/ArchiveReader.cpp b/lib/Bytecode/Archive/ArchiveReader.cpp
index 67b6549e15..58b1e20ca6 100644
--- a/lib/Bytecode/Archive/ArchiveReader.cpp
+++ b/lib/Bytecode/Archive/ArchiveReader.cpp
@@ -205,10 +205,10 @@ Archive::parseMemberHeader(const char*& At, const char* End, std::string* error)
 
   // Determine if this is a bytecode file
   switch (sys::IdentifyFileType(At, 4)) {
-    case sys::BytecodeFileType:
+    case sys::Bytecode_FileType:
       flags |= ArchiveMember::BytecodeFlag;
       break;
-    case sys::CompressedBytecodeFileType:
+    case sys::CompressedBytecode_FileType:
       flags |= ArchiveMember::CompressedBytecodeFlag;
       flags &= ~ArchiveMember::CompressedFlag;
       break;
diff --git a/lib/Bytecode/Archive/ArchiveWriter.cpp b/lib/Bytecode/Archive/ArchiveWriter.cpp
index fc85374c02..b8e3280c12 100644
--- a/lib/Bytecode/Archive/ArchiveWriter.cpp
+++ b/lib/Bytecode/Archive/ArchiveWriter.cpp
@@ -178,10 +178,10 @@ Archive::addFileBefore(const sys::Path& filePath, iterator where,
   std::string magic;
   mbr->path.getMagicNumber(magic,4);
   switch (sys::IdentifyFileType(magic.c_str(),4)) {
-    case sys::BytecodeFileType:
+    case sys::Bytecode_FileType:
       flags |= ArchiveMember::BytecodeFlag;
       break;
-    case sys::CompressedBytecodeFileType:
+    case sys::CompressedBytecode_FileType:
       flags |= ArchiveMember::CompressedBytecodeFlag;
       break;
     default: