diff options
| author | William Woodruff | 2016-11-08 16:16:34 -0500 |
|---|---|---|
| committer | William Woodruff | 2016-11-09 17:35:56 -0500 |
| commit | 9267511e6b561b83e6a3518b7cf4a1d45e2d251d (patch) | |
| tree | a58ac343094873651e6c75b50b73671d8f9a1d8c /Library | |
| parent | 032ed07bce6ec15ae24bb9e6989fd1ab8ecc27ce (diff) | |
| download | brew-9267511e6b561b83e6a3518b7cf4a1d45e2d251d.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 |