diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-05 02:37:41 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-05 02:37:41 +0000 |
| commit | 1692d4933845fad2f35fd949e9473688029da00b (patch) | |
| tree | c31c016f8e991b8a736b40f6dc114ff51b64683c /lib | |
| parent | 1d50afc2a201dbac64caed4df35b6ff44c1fc38e (diff) | |
mkmf.rb: different strings from conflict markers
* lib/mkmf.rb (MakeMakefile#macro_defined?): use clearly different
strings from conflict markers.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index d41e0c3552..0e9d64f0d7 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -757,7 +757,7 @@ SRC /*top*/ #ifndef #{macro} # error ->>>>>> #{macro} undefined <<<<<< +|:/ === #{macro} undefined === /:| #endif SRC end |