From 126c15d9ae7459bea801ef9d33f344e799c0f512 Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Tue, 8 Nov 2016 16:16:34 -0500 Subject: [PATCH] os/mac: Rename MachO -> MachOShim Prevents namespace conflict with vendored ruby-macho. --- Library/Homebrew/os/mac/mach.rb | 2 +- Library/Homebrew/os/mac/pathname.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/os/mac/mach.rb b/Library/Homebrew/os/mac/mach.rb index 44c5ee50ad..4113a06018 100644 --- a/Library/Homebrew/os/mac/mach.rb +++ b/Library/Homebrew/os/mac/mach.rb @@ -1,7 +1,7 @@ require "vendor/macho/macho" require "os/mac/architecture_list" -module MachO +module MachOShim # @private def macho @macho ||= begin diff --git a/Library/Homebrew/os/mac/pathname.rb b/Library/Homebrew/os/mac/pathname.rb index 9b65d7ac02..5fd59e1e79 100644 --- a/Library/Homebrew/os/mac/pathname.rb +++ b/Library/Homebrew/os/mac/pathname.rb @@ -1,5 +1,5 @@ require "os/mac/mach" class Pathname - include MachO + include MachOShim end