diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-24 08:34:24 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-24 08:34:24 +0000 |
| commit | 976bf35c12581658f817541450cac253df3bc2d2 (patch) | |
| tree | 0a8082e668705eefdc246e310679690cbdd5a5bd /ext | |
| parent | 116ec560bde5402a5fa6a508376c4e988c583b64 (diff) | |
merge revision(s) 49154,49155,49156,49159: [Backport #10384] [Backport #11085]
ext/-test-/dln/empty: move from ext/-test-/win32/dln
* test/fiddle/test_handle.rb: fix syntax.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50383 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/-test-/dln/empty/empty.c (renamed from ext/-test-/win32/dln/empty/empty.c) | 0 | ||||
| -rw-r--r-- | ext/-test-/dln/empty/extconf.rb | 1 | ||||
| -rw-r--r-- | ext/-test-/win32/dln/empty/extconf.rb | 3 |
3 files changed, 1 insertions, 3 deletions
diff --git a/ext/-test-/win32/dln/empty/empty.c b/ext/-test-/dln/empty/empty.c index c4f94f1644..c4f94f1644 100644 --- a/ext/-test-/win32/dln/empty/empty.c +++ b/ext/-test-/dln/empty/empty.c diff --git a/ext/-test-/dln/empty/extconf.rb b/ext/-test-/dln/empty/extconf.rb new file mode 100644 index 0000000000..6110887b3d --- /dev/null +++ b/ext/-test-/dln/empty/extconf.rb @@ -0,0 +1 @@ +create_makefile("-test-/dln/empty") diff --git a/ext/-test-/win32/dln/empty/extconf.rb b/ext/-test-/win32/dln/empty/extconf.rb deleted file mode 100644 index a4efed90c9..0000000000 --- a/ext/-test-/win32/dln/empty/extconf.rb +++ /dev/null @@ -1,3 +0,0 @@ -if $mingw or $mswin - create_makefile("-test-/win32/dln/empty") -end |