summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-28 17:46:51 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-28 17:46:51 +0000
commit82752cc1ce2129c9d44515f40739a27b88218f0d (patch)
treedbd07801c2fe4918bad29c035d4083c252eaa850 /ext
parent7892ad93b69de399626ce189459addee81c1ad6e (diff)
merge revision(s) 49154: [Backport #10384]
ext/-test-/dln/empty: move from ext/-test-/win32/dln git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54342 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.rb1
-rw-r--r--ext/-test-/win32/dln/empty/extconf.rb3
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