diff options
| author | William Woodruff | 2016-11-08 16:16:34 -0500 |
|---|---|---|
| committer | William Woodruff | 2016-11-08 16:16:34 -0500 |
| commit | 126c15d9ae7459bea801ef9d33f344e799c0f512 (patch) | |
| tree | d5c828d0aa9b456be86f1a8271d3f5e512ab32c6 /Library | |
| parent | 79b124b78d04bc57ac5d0df67a0dcca8dbbcb922 (diff) | |
| download | brew-126c15d9ae7459bea801ef9d33f344e799c0f512.tar.bz2 | |
os/mac: Rename MachO -> MachOShim
Prevents namespace conflict with vendored ruby-macho.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/os/mac/mach.rb | 2 | ||||
| -rw-r--r-- | 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 44c5ee50a..4113a0601 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 9b65d7ac0..5fd59e1e7 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 |