summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-03-05 09:31:32 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-03-05 09:31:32 +0000
commitca63c2c062609f6493d182e7aeb887435cf506bb (patch)
tree19fd7866312c14a54ad5e59ece786ebc03311d1e
parent26dd1065f46922d6c4a007c4ddc8a61a70c6c6fc (diff)
* dir.c (fnmatch): removed unnecessary code. (ruby_1_8 didn't have
String#clear, so [ruby-dev:24749] didn't affect it) * win32/win32.c (NtInitialize): ditto. (by numeric.c 1.101.2.14) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog11
-rw-r--r--dir.c2
-rw-r--r--win32/win32.c4
3 files changed, 7 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 009d2db7ef..1d75d1b46b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Mar 5 18:06:21 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * dir.c (fnmatch): removed unnecessary code. (ruby_1_8 didn't have
+ String#clear, so [ruby-dev:24749] didn't affect it)
+
+ * win32/win32.c (NtInitialize): ditto. (by numeric.c 1.101.2.14)
+
Sat Mar 5 16:29:26 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/multi-tk.rb: freeze callback-entry objects
@@ -3714,10 +3721,6 @@ Wed Jul 14 12:29:07 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* test/ruby/test_float.rb (test_strtod): add test for bug fix.
-Wed Jul 14 01:18:45 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * array.c: rdoc patch - unified margin.
-
Wed Jul 14 00:31:15 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* array.c: rdoc patch. merged patch from Johan Holmberg
diff --git a/dir.c b/dir.c
index 698157ad67..25748ed4e2 100644
--- a/dir.c
+++ b/dir.c
@@ -145,8 +145,6 @@ fnmatch(pat, string, flags)
int period = !(flags & FNM_DOTMATCH);
int nocase = flags & FNM_CASEFOLD;
- if (!pat) pat = "";
- if (!string) string = "";
while (c = *pat++) {
switch (c) {
case '?':
diff --git a/win32/win32.c b/win32/win32.c
index bc3e2f935e..b9c09785d5 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -365,10 +365,6 @@ NtInitialize(int *argc, char ***argv)
WORD version;
int ret;
-#ifdef __BORLANDC__
- _controlfp(0x5, 0x5);
-#endif
-
//
// Now set up the correct time stuff
//